1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 35cad4182a..40836e0c51 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -805,7 +805,9 @@ class FederationHandler(BaseHandler):
                     yield self._handle_new_event(
                         origin, ev, auth_events=auth
                     )
-                    auth_events[(ev.type, ev.state_key)] = ev
+
+                    if ev.event_id in event_auth_events:
+                        auth_events[(ev.type, ev.state_key)] = ev
                 except AuthError:
                     pass