1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index c300c6e29c..2b5c2d999d 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -103,12 +103,18 @@ class StateStore(SQLBaseStore):
                 for row in rows
             ]
 
-        for vals in states.values():
+        @defer.inlineCallbacks
+        def c(vals):
             vals[:] = yield self.runInteraction(
                 "_get_state_groups_ev",
                 fetch_events, vals
             )
 
+        yield defer.gatherResults(
+            [c(vals) for vals in states.values()],
+            consumeErrors=True,
+        )
+
         defer.returnValue(states)
 
     def _store_state_groups_txn(self, txn, event, context):