Merge branch 'release-v1.10.0' into matrix-org-hotfixes v1.10.0rc4

1 files changed, 1 insertions, 0 deletions

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

index 83389d19db..14e7e6ab5b 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -886,6 +886,7 @@ class SyncHandler(object):
             for e in sync_config.filter_collection.filter_room_state(
                 list(state.values())
             )
+            if e.type != EventTypes.Aliases  # until MSC2261 or alternative solution
         }
 
     async def unread_notifs_for_room_id(self, room_id, sync_config):