diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
index 58d4a23cf2..9fda8b8548 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
@@ -42,7 +42,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageConten
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.UnknownMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
 import io.element.android.libraries.matrix.ui.messages.toHtmlDocument
@@ -174,13 +173,6 @@ class TimelineItemContentMessageFactory @Inject constructor(
                 htmlDocument = null,
                 isEdited = content.isEdited,
             )
-            UnknownMessageType -> TimelineItemTextContent(
-                // Display the body as a fallback, but should not happen anymore
-                // (we have `OtherMessageType` now)
-                body = content.body,
-                htmlDocument = null,
-                isEdited = content.isEdited,
-            )
         }
     }
 
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
index d60802b471..2dcb19cc43 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
@@ -48,7 +48,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.StickerConten
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.api.timeline.item.event.UnknownContent
-import io.element.android.libraries.matrix.api.timeline.item.event.UnknownMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
 import io.element.android.libraries.matrix.ui.messages.toPlainText
@@ -138,11 +137,6 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
             is OtherMessageType -> {
                 messageType.body
             }
-            UnknownMessageType -> {
-                // Display the body as a fallback, but should not happen anymore
-                // (we have `OtherMessageType` now)
-                messageContent.body
-            }
             is NoticeMessageType -> {
                 messageType.body
             }
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
index f7b98626e6..8eed121568 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
@@ -45,7 +45,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.StickerConten
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.api.timeline.item.event.UnknownContent
-import io.element.android.libraries.matrix.api.timeline.item.event.UnknownMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
 import io.element.android.libraries.matrix.test.A_USER_ID
@@ -170,6 +169,7 @@ class DefaultRoomLastMessageFormatterTest {
             LocationMessageType(body, "geo:1,2", null),
             NoticeMessageType(body, null),
             EmoteMessageType(body, null),
+            OtherMessageType(msgType = "a_type", body = body),
         )
         val senderName = "Someone"
         val resultsInRoom = mutableListOf<Pair<MessageType, CharSequence?>>()
@@ -187,13 +187,6 @@ class DefaultRoomLastMessageFormatterTest {
                     resultsInRoom.add(type to result)
                 }
             }
-            val unknownMessage = createRoomEvent(sentByYou = false, senderDisplayName = "Someone", content = createMessageContent(UnknownMessageType))
-            val result = UnknownMessageType to formatter.format(unknownMessage, isDmRoom = isDm)
-            if (isDm) {
-                resultsInDm.add(result)
-            } else {
-                resultsInRoom.add(result)
-            }
         }
 
         // Verify results of DM mode
@@ -208,8 +201,7 @@ class DefaultRoomLastMessageFormatterTest {
                 is EmoteMessageType -> "* $senderName ${type.body}"
                 is TextMessageType,
                 is NoticeMessageType,
-                is OtherMessageType,
-                UnknownMessageType -> body
+                is OtherMessageType -> body
             }
             Truth.assertWithMessage("$type was not properly handled for DM").that(result).isEqualTo(expectedResult)
         }
@@ -226,8 +218,7 @@ class DefaultRoomLastMessageFormatterTest {
                 is LocationMessageType -> "$senderName: Shared location"
                 is TextMessageType,
                 is NoticeMessageType,
-                is OtherMessageType,
-                UnknownMessageType -> "$senderName: $body"
+                is OtherMessageType -> "$senderName: $body"
                 is EmoteMessageType -> "* $senderName ${type.body}"
             }
             val shouldCreateAnnotatedString = when (type) {
@@ -240,7 +231,6 @@ class DefaultRoomLastMessageFormatterTest {
                 is EmoteMessageType -> false
                 is TextMessageType, is NoticeMessageType -> true
                 is OtherMessageType -> true
-                UnknownMessageType -> true
             }
             if (shouldCreateAnnotatedString) {
                 Truth.assertWithMessage("$type doesn't produce an AnnotatedString")
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageType.kt
index c8122935bd..14c2302def 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageType.kt
@@ -25,8 +25,6 @@ import io.element.android.libraries.matrix.api.media.VideoInfo
 
 sealed interface MessageType
 
-data object UnknownMessageType : MessageType
-
 data class EmoteMessageType(
     val body: String,
     val formatted: FormattedBody?
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt
index 7f88cc0569..4f19a5c40f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt
@@ -30,7 +30,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.UnknownMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
 import io.element.android.libraries.matrix.impl.media.map
@@ -76,7 +75,7 @@ class EventMessageMapper {
         )
     }
 
-    fun mapMessageType(type: RustMessageType?) = when (type) {
+    fun mapMessageType(type: RustMessageType) = when (type) {
         is RustMessageType.Audio -> {
             when (type.content.voice) {
                 null -> {
@@ -120,7 +119,6 @@ class EventMessageMapper {
         is MessageType.Other -> {
             OtherMessageType(type.msgtype, type.body)
         }
-        null -> UnknownMessageType
     }
 }
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt
index 8474e9a045..9093b36615 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolver.kt
@@ -34,7 +34,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessa
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.UnknownMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
 import io.element.android.libraries.matrix.ui.messages.toPlainText
@@ -222,7 +221,6 @@ class NotifiableEventResolver @Inject constructor(
             is VideoMessageType -> messageType.body
             is LocationMessageType -> messageType.body
             is OtherMessageType -> messageType.body
-            is UnknownMessageType -> stringProvider.getString(CommonStrings.common_unsupported_event)
         }
     }
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolverTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolverTest.kt
index 9e18f225b8..819a1e94a2 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolverTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotifiableEventResolverTest.kt
@@ -29,7 +29,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
-import io.element.android.libraries.matrix.api.timeline.item.event.UnknownMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
@@ -234,23 +233,6 @@ class NotifiableEventResolverTest {
         assertThat(result).isEqualTo(expectedResult)
     }
 
-    @Test
-    fun `resolve event message unknown`() = runTest {
-        val sut = createNotifiableEventResolver(
-            notificationResult = Result.success(
-                createNotificationData(
-                    content = NotificationContent.MessageLike.RoomMessage(
-                        senderId = A_USER_ID_2,
-                        messageType =  UnknownMessageType,
-                    )
-                )
-            )
-        )
-        val result = sut.resolveEvent(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID)
-        val expectedResult = createNotifiableMessageEvent(body = "Unsupported event")
-        assertThat(result).isEqualTo(expectedResult)
-    }
-
     @Test
     fun `resolve poll`() = runTest {
         val sut = createNotifiableEventResolver(