summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/state.py')
-rw-r--r--synapse/state.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py
index d1d6f95246..ebec0ad9dc 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -166,13 +166,15 @@ class StateHandler(object):
             prev_state
         )
 
-        if hasattr(event, "auth_events"):
+        if hasattr(event, "auth_events") and event.auth_events:
             auth_ids = zip(*event.auth_events)[0]
             context.auth_events = {
                 k: v
                 for k, v in context.current_state.items()
                 if v.event_id in auth_ids
             }
+        else:
+            context.auth_events = {}
 
         defer.returnValue(prev_state)