diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventsObserverTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventsObserverTask.kt
index b8879739f4..950381ef6b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventsObserverTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventsObserverTask.kt
@@ -52,10 +52,17 @@ internal class DefaultCallEventsObserverTask @Inject constructor(
     }
 
     private fun update(realm: Realm, events: List<Event>, userId: String) {
+        val now = System.currentTimeMillis()
         events.forEach { event ->
             event.roomId ?: return@forEach Unit.also {
                 Timber.w("Event with no room id ${event.eventId}")
             }
+            val age = now - (event.ageLocalTs ?: now)
+            if (age > 40_000) {
+                // To old to ring?
+                return@forEach
+            }
+            event.ageLocalTs
             decryptIfNeeded(event)
             if (EventType.isCallEvent(event.getClearType())) {
                 callService.onCallEvent(event)
diff --git a/vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt b/vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt
index 0c7f2be691..d75184ecca 100644
--- a/vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt
+++ b/vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt
@@ -581,7 +581,7 @@ class WebRtcPeerConnectionManager @Inject constructor(
 
     override fun onCallInviteReceived(mxCall: MxCall, callInviteContent: CallInviteContent) {
         Timber.v("## VOIP onCallInviteReceived callId ${mxCall.callId}")
-        // TODO What if a call is currently active?
+        // to simplify we only treat one call at a time, and ignore others
         if (currentCall != null) {
             Timber.w("## VOIP receiving incoming call while already in call?")
             // Just ignore, maybe we could answer from other session?