2 files changed, 4 insertions, 7 deletions
diff --git a/synapse/handlers/sliding_sync.py b/synapse/handlers/sliding_sync.py
index 306c4286e7..b4ecf87f2e 100644
--- a/synapse/handlers/sliding_sync.py
+++ b/synapse/handlers/sliding_sync.py
@@ -639,7 +639,9 @@ class SlidingSyncHandler:
             )
             rooms_should_send.update(rooms_that_have_updates)
             relevant_room_map = {
-                r: c for r, c in relevant_room_map.items() if r in rooms_should_send
+                room_id: room_sync_config
+                for room_id, room_sync_config in relevant_room_map.items()
+                if room_id in rooms_should_send
             }
 
         @trace
diff --git a/tests/rest/client/test_sync.py b/tests/rest/client/test_sync.py
index 7f3d5907cf..fc170ebd4e 100644
--- a/tests/rest/client/test_sync.py
+++ b/tests/rest/client/test_sync.py
@@ -4754,12 +4754,7 @@ class SlidingSyncTestCase(SlidingSyncBase):
             "lists": {
                 "foo-list": {
                     "ranges": [[0, 1]],
-                    "required_state": [
-                        [EventTypes.Create, ""],
-                        [EventTypes.RoomHistoryVisibility, ""],
-                        # This one doesn't exist in the room
-                        [EventTypes.Tombstone, ""],
-                    ],
+                    "required_state": [],
                     "timeline_limit": 0,
                 }
             }