1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 185f88fd7c..ecb62e6dfd 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -412,9 +412,10 @@ class StateStore(SQLBaseStore):
                 full=(types is None),
             )
 
-            results[group].update({
+            # We replace here to remove all the entries with None values.
+            results[group] = {
                 key: value for key, value in state_dict.items() if value
-            })
+            }
 
         defer.returnValue(results)