diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt
index 0ba3c9b7d9..dfd1b2ed0e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt
@@ -108,7 +108,6 @@ internal fun TimelineItemCallNotifyView(
 internal fun TimelineItemCallNotifyViewPreview() = ElementPreview {
     Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
         listOf(
-            TimelineItemRtcNotificationContent(null),
             TimelineItemRtcNotificationContent(CallIntent.AUDIO),
             TimelineItemRtcNotificationContent(CallIntent.VIDEO),
         ).forEach { content ->
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt
index 168d11af16..53facfc675 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt
@@ -10,6 +10,6 @@ package io.element.android.features.messages.impl.timeline.model.event
 
 import io.element.android.libraries.matrix.api.notification.CallIntent
 
-class TimelineItemRtcNotificationContent(val callIntent: CallIntent?) : TimelineItemEventContent {
+class TimelineItemRtcNotificationContent(val callIntent: CallIntent) : TimelineItemEventContent {
     override val type: String = "org.matrix.msc4075.rtc.notification"
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
index 12fb0b5f81..9cecb57800 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
@@ -117,7 +117,7 @@ data class LiveLocationContent(
 data object LegacyCallInviteContent : EventContent
 
 data class CallNotifyContent(
-    val callIntent: CallIntent?
+    val callIntent: CallIntent
 ) : EventContent
 
 data object UnknownContent : EventContent
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
index d9e47b00c7..11514d73c6 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
@@ -110,7 +110,7 @@ class TimelineEventContentMapper(
                         }
                         is MsgLikeKind.LiveLocation -> {
                             // Live location messages are a special kind of message that we want to treat as unknown content for now
-                             UnknownContent
+                            UnknownContent
                         }
                         is MsgLikeKind.Other -> UnknownContent
                     }
@@ -139,12 +139,10 @@ class TimelineEventContentMapper(
                 }
                 is TimelineItemContent.CallInvite -> LegacyCallInviteContent
                 is TimelineItemContent.RtcNotification -> CallNotifyContent(
-                    it.callIntent?.let { intentString ->
-                        if (intentString == "audio") {
-                            CallIntent.AUDIO
-                        } else {
-                            CallIntent.VIDEO
-                        }
+                    callIntent = if (it.callIntent == "audio") {
+                        CallIntent.AUDIO
+                    } else {
+                        CallIntent.VIDEO
                     }
                 )
             }