diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt
index adadc3ef78..359347fb31 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt
@@ -53,10 +53,10 @@ class MediaViewerNode @AssistedInject constructor(
     private val presenter = presenterFactory.create(
         inputs = inputs,
         navigator = this,
-        mediaGalleryDataSource = if (inputs.eventId != null) {
-            timelineMediaGalleryDataSource
-        } else {
+        mediaGalleryDataSource = if (inputs.mode == MediaViewerEntryPoint.MediaViewerMode.SingleMedia) {
             SingleMediaGalleryDataSource.createFrom(inputs)
+        } else {
+            timelineMediaGalleryDataSource
         },
     )