diff --git a/lib/src/database/matrix_sdk_database.dart b/lib/src/database/matrix_sdk_database.dart
index 2f128a1b..18407abe 100644
--- a/lib/src/database/matrix_sdk_database.dart
+++ b/lib/src/database/matrix_sdk_database.dart
@@ -666,7 +666,8 @@ class MatrixSdkDatabase extends DatabaseApi with DatabaseFileStorage {
       unimportantEvents.addAll(
           states.values.map((raw) => Event.fromJson(copyMap(raw), room)));
     }
-    return unimportantEvents;
+
+    return unimportantEvents.where((event) => event.stateKey != null).toList();
   }
 
   @override