Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py

index 34e60d0a73..81f3b4b1ff 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -886,7 +886,7 @@ class ReplicationFederationHandlerRegistry(FederationHandlerRegistry):
     def on_edu(self, edu_type, origin, content):
         """Overrides FederationHandlerRegistry
         """
-        if edu_type == "m.presence":
+        if not self.config.use_presence and edu_type == "m.presence":
             return
 
         handler = self.edu_handlers.get(edu_type)