Merge remote-tracking branch 'origin/release-v1.25.0' into matrix-org-hotfixes

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index b9ae70adbe..893a571466 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -555,7 +555,7 @@ class SyncHandler:
             event.event_id, state_filter=state_filter
         )
         if event.is_state():
-            state_ids = state_ids.copy()
+            state_ids = dict(state_ids)
             state_ids[(event.type, event.state_key)] = event.event_id
         return state_ids