diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index bacba36755..5c625ddabf 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -510,7 +510,7 @@ class ReplicationLayer(object):
     @log_function
     def _handle_new_pdu(self, origin, pdu, backfilled=False):
         # We reprocess pdus when we have seen them only as outliers
-        existing = yield self._get_persisted_pdu(pdu.event_id)
+        existing = yield self._get_persisted_pdu(origin, pdu.event_id)
 
         if existing and (not existing.outlier or pdu.outlier):
             logger.debug("Already seen pdu %s", pdu.event_id)
@@ -528,7 +528,7 @@ class ReplicationLayer(object):
 
             if min_depth and pdu.depth > min_depth:
                 for event_id, hashes in pdu.prev_events:
-                    exists = yield self._get_persisted_pdu(event_id)
+                    exists = yield self._get_persisted_pdu(origin, event_id)
 
                     if not exists:
                         logger.debug("Requesting pdu %s", event_id)
diff --git a/synapse/state.py b/synapse/state.py
index a58acb3c1e..11c54fd38c 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -105,7 +105,7 @@ class StateHandler(object):
             defer.returnValue(res[1].get((event_type, state_key)))
             return
 
-        defer.returnValue(res.values())
+        defer.returnValue(res[1].values())
 
     @defer.inlineCallbacks
     @log_function