Fix bug where we /always/ created a new state group

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index e909af6bd8..c2cd91bb39 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -448,8 +448,9 @@ class FederationHandler(BaseHandler):
         )
 
         if state_groups:
+            _, state = state_groups.items().pop()
             results = {
-                (e.type, e.state_key): e for e in state_groups[0].state
+                (e.type, e.state_key): e for e in state
             }
 
             event = yield self.store.get_event(event_id)