1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index d667d358ab..4cd795e202 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -878,7 +878,7 @@ class FederationHandler(BaseHandler):
                     (d.type, d.state_key) for d in different_events
                 })
 
-                new_state, prev_state = self.state.resolve_events(
+                new_state, prev_state = self.state_handler.resolve_events(
                     [local_view, remote_view],
                     event
                 )