diff --git a/lib/src/database/hive_collections_database.dart b/lib/src/database/hive_collections_database.dart
index abdc67ad..aeb22590 100644
--- a/lib/src/database/hive_collections_database.dart
+++ b/lib/src/database/hive_collections_database.dart
@@ -700,7 +700,7 @@ class HiveCollectionsDatabase extends DatabaseApi {
       unimportantEvents.addAll(
           states.values.map((raw) => Event.fromJson(copyMap(raw), room)));
     }
-    return unimportantEvents;
+    return unimportantEvents.where((event) => event.stateKey != null).toList();
   }
 
   @override
diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
index e2130912..ddf4f92e 100644
--- a/lib/src/database/hive_database.dart
+++ b/lib/src/database/hive_database.dart
@@ -692,7 +692,7 @@ class FamedlySdkHiveDatabase extends DatabaseApi with ZoneTransactionMixin {
       unimportantEvents.addAll(
           states.values.map((raw) => Event.fromJson(convertToJson(raw), room)));
     }
-    return unimportantEvents;
+    return unimportantEvents.where((event) => event.stateKey != null).toList();
   }
 
   @override