diff --git a/CHANGES.md b/CHANGES.md
index 4a81a04627..f776560de7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.10.0rc4 (2020-02-11)
+==============================
+
+Features
+--------
+
+- Filter out m.room.aliases from /sync state blocks until a full fix lands. ([\#6884](https://github.com/matrix-org/synapse/issues/6884))
+
+
 Synapse 1.10.0rc3 (2020-02-10)
 ==============================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 36c0cf557a..cc69ff0c41 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.10.0rc3"
+__version__ = "1.10.0rc4"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index f8d60d32ba..4324bc702e 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -932,6 +932,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(