diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
index b8fa99837e..47833f057a 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
@@ -35,7 +35,7 @@ class NotificationFactory @Inject constructor(
                     eventId = events.firstOrNull()?.event?.eventId.orEmpty(),
                     roomName = events.firstOrNull()?.event?.roomName.orEmpty(),
                     notification = notificationUtils.buildIncomingJitsiCallNotification(
-                            callId = events.firstOrNull()?.event?.eventId.orEmpty(),
+                            callId = events.firstOrNull()?.event?.eventId.orEmpty().ifEmpty { roomId },
                             signalingRoomId = roomId,
                             otherUserId = events.firstOrNull()?.event?.matrixID.orEmpty(),
                             isIncomingCall = true,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt
index 83adfd5176..df948cd8b6 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationRenderer.kt
@@ -76,8 +76,9 @@ class NotificationRenderer @Inject constructor(
                 when (wrapper) {
                     is JitsiNotification.IncomingCall -> {
                         Timber.d("Updating jitsi call notification ${wrapper.roomId} for room ${wrapper.roomName}")
-                        if (wrapper.eventId.isNotEmpty()) {
-                            notificationDisplayer.showNotificationMessage(wrapper.eventId, JITSI_CALL_NOTIFICATION_ID, wrapper.notification)
+                        if (wrapper.eventId.isNotEmpty() || wrapper.roomId.isNotEmpty()) {
+                            val tag = wrapper.eventId.ifEmpty { wrapper.roomId }
+                            notificationDisplayer.showNotificationMessage(tag, JITSI_CALL_NOTIFICATION_ID, wrapper.notification)
                         }
                     }
                 }