1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index eb9fbb8109..8c072886b2 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -109,7 +109,10 @@ class StateFilter:
             type_dict.setdefault(typ, set()).add(s)  # type: ignore
 
         return StateFilter(
-            types=frozendict((k, frozenset(v)) for k, v in type_dict.items())
+            types=frozendict(
+                (k, frozenset(v) if v is not None else None)
+                for k, v in type_dict.items()
+            )
         )
 
     @staticmethod