diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
index 9213923049..146827085d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -660,7 +660,9 @@ private fun ReplyToContentText(metadata: InReplyToMetadata?) {
     val text = when (metadata) {
         InReplyToMetadata.Redacted -> stringResource(id = CommonStrings.common_message_removed)
         InReplyToMetadata.UnableToDecrypt -> stringResource(id = CommonStrings.common_waiting_for_decryption_key)
-        else -> metadata?.text.orEmpty()
+        is InReplyToMetadata.Text -> metadata.text
+        is InReplyToMetadata.Thumbnail -> metadata.text
+        null -> ""
     }
     val iconResourceId = when (metadata) {
         InReplyToMetadata.Redacted -> CompoundDrawables.ic_compound_delete
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt
index 4ba96272b2..bbf36afa36 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt
@@ -43,24 +43,20 @@ import io.element.android.libraries.ui.strings.CommonStrings
 
 @Immutable
 internal sealed interface InReplyToMetadata {
-    val text: String?
-
     data class Thumbnail(
         val attachmentThumbnailInfo: AttachmentThumbnailInfo
     ) : InReplyToMetadata {
-        override val text: String? = attachmentThumbnailInfo.textContent
+        val text: String = attachmentThumbnailInfo.textContent.orEmpty()
     }
 
     data class Text(
-        override val text: String
+        val text: String
     ) : InReplyToMetadata
 
-    abstract class Informative : InReplyToMetadata {
-        override val text: String? = null
-    }
+    sealed interface Informative : InReplyToMetadata
 
-    data object Redacted : Informative()
-    data object UnableToDecrypt : Informative()
+    data object Redacted : Informative
+    data object UnableToDecrypt : Informative
 }
 
 /**