diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt
index 86f7730780..1c96e0f44b 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt
@@ -71,8 +71,8 @@ private fun MatrixTimelineItem.Event.isUnchanged(
     previousItems: List<MatrixTimelineItem>,
 ): Boolean {
     val previousItem = previousItems
-        .filterIsInstance<MatrixTimelineItem.Event>()
-        .find { it.uniqueId == uniqueId }
+        .find { (it as? MatrixTimelineItem.Event)?.uniqueId == uniqueId }
+        as? MatrixTimelineItem.Event
     return previousItem != null &&
         previousItem.event.eventId == event.eventId &&
         previousItem.event.timestamp == event.timestamp