diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 0aac8c17b9..778d68ad3f 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1997,9 +1997,7 @@ class SyncHandler:
         if since_token:
             membership_change_events = await self.store.get_membership_changes_for_user(
                 user_id,
-                # TODO: We should make this change,
-                # https://github.com/element-hq/synapse/pull/17187#discussion_r1617871321
-                token_before_rooms.room_key,
+                since_token.room_key,
                 now_token.room_key,
                 self.rooms_to_exclude_globally,
             )