Merge branch 'erikj/fix_presence_joined' into erikj/test_send

2 files changed, 2 insertions, 1 deletions

diff --git a/changelog.d/9910.misc b/changelog.d/9910.misc
new file mode 100644

index 0000000000..54165cce18
--- /dev/null
+++ b/changelog.d/9910.misc
@@ -0,0 +1 @@
+Improve performance after joining a large room when presence is enabled.
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py

index ebbc234334..8e085dfbec 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -1293,7 +1293,7 @@ class PresenceHandler(BasePresenceHandler):
 
             remote_host = get_domain_from_id(user_id)
 
-            users = await self.state.get_current_users_in_room(room_id)
+            users = await self.store.get_users_in_room(room_id)
             user_ids = list(filter(self.is_mine_id, users))
 
             states_d = await self.current_state_for_users(user_ids)