1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index a193649852..06f0ab3ff6 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -433,7 +433,10 @@ class StateStore(SQLBaseStore):
                 key: None
                 for key in missing_types
             }
-            evs = [state_events[e_id] for e_id in state_ids]
+            evs = [
+                state_events[e_id] for e_id in state_ids
+                if e_id in state_events  # This can happen if event is rejected.
+            ]
             state_dict.update({
                 (e.type, e.state_key): e
                 for e in evs