1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index bc0f7b0ee7..d35d9f603c 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -315,6 +315,7 @@ class FederationHandler(BaseHandler):
 
         likely_domains = [
             domain for domain, depth in curr_domains
+            if domain is not self.server_name
         ]
 
         @defer.inlineCallbacks
@@ -364,6 +365,7 @@ class FederationHandler(BaseHandler):
         # from the time.
 
         tried_domains = set(likely_domains)
+        tried_domains.add(self.server_name)
 
         event_ids = list(extremities.keys())