1 files changed, 5 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 90649af9e1..2bfd0a40e0 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -229,7 +229,7 @@ class FederationHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def _filter_events_for_server(self, server_name, room_id, events):
-        states = yield self.store.get_state_for_events(
+        event_to_state = yield self.store.get_state_for_events(
             room_id, frozenset(e.event_id for e in events),
             types=(
                 (EventTypes.RoomHistoryVisibility, ""),
@@ -237,8 +237,6 @@ class FederationHandler(BaseHandler):
             )
         )
 
-        events_and_states = zip(events, states)
-
         def redact_disallowed(event_and_state):
             event, state = event_and_state
 
@@ -275,9 +273,10 @@ class FederationHandler(BaseHandler):
 
             return event
 
-        res = map(redact_disallowed, events_and_states)
-
-        logger.info("_filter_events_for_server %r", res)
+        res = map(redact_disallowed, [
+            (e, event_to_state[e.event_id])
+            for e in events
+        ])
 
         defer.returnValue(res)