2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/10102.misc b/changelog.d/10102.misc
new file mode 100644
index 0000000000..87672ee295
--- /dev/null
+++ b/changelog.d/10102.misc
@@ -0,0 +1 @@
+Make `/sync` do fewer state resolutions.
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 0fcc1532da..069ffc76f7 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -463,7 +463,7 @@ class SyncHandler:
                 # ensure that we always include current state in the timeline
                 current_state_ids = frozenset()  # type: FrozenSet[str]
                 if any(e.is_state() for e in recents):
-                    current_state_ids_map = await self.state.get_current_state_ids(
+                    current_state_ids_map = await self.store.get_current_state_ids(
                         room_id
                     )
                     current_state_ids = frozenset(current_state_ids_map.values())
@@ -523,7 +523,7 @@ class SyncHandler:
                 # ensure that we always include current state in the timeline
                 current_state_ids = frozenset()
                 if any(e.is_state() for e in loaded_recents):
-                    current_state_ids_map = await self.state.get_current_state_ids(
+                    current_state_ids_map = await self.store.get_current_state_ids(
                         room_id
                     )
                     current_state_ids = frozenset(current_state_ids_map.values())