diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
index a8a22b21d8..a801437e82 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
@@ -206,8 +206,6 @@ class MediaViewerPresenter @AssistedInject constructor(
         }
         return data.indexOfFirst {
             (it as? MediaViewerPageData.MediaViewerData)?.eventId == eventId
-        }
-            .takeIf { it != -1 }
-            ?: 0
+        }.coerceAtLeast(0)
     }
 }