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
diff --git a/lib/src/voip/call_session.dart b/lib/src/voip/call_session.dart
index 8ffde2ea..bab1afce 100644
--- a/lib/src/voip/call_session.dart
+++ b/lib/src/voip/call_session.dart
@@ -983,7 +983,9 @@ class CallSession {
       onCallHangupNotifierForGroupCalls.add(this);
       await voip.delegate.handleCallEnded(this);
       fireCallEvent(CallStateChange.kHangup);
-      if ((party == CallParty.kRemote && _missedCall)) {
+      if ((party == CallParty.kRemote &&
+          _missedCall &&
+          reason != CallErrorCode.answeredElsewhere)) {
         await voip.delegate.handleMissedCall(this);
       }
     }