diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py
index 91d19857b1..823a4998c3 100644
--- a/synapse/storage/event_federation.py
+++ b/synapse/storage/event_federation.py
@@ -411,6 +411,9 @@ class EventFederationStore(SQLBaseStore):
             except Empty:
                 break
 
+            if event_id in event_results:
+                continue
+
             event_results.add(event_id)
 
             txn.execute(