diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt
index d4065f76c2..711ac8c66c 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/EventItemFactory.kt
@@ -10,7 +10,7 @@ package io.element.android.libraries.mediaviewer.impl.gallery
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
 import io.element.android.libraries.dateformatter.api.toHumanReadableDuration
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
@@ -49,7 +49,7 @@ interface EventItemFactory {
     fun create(currentTimelineItem: MatrixTimelineItem.Event): MediaItem.Event?
 }
 
-@ContributesBinding(AppScope::class)
+@ContributesBinding(RoomScope::class)
 class DefaultEventItemFactory @Inject constructor(
     private val fileSizeFormatter: FileSizeFormatter,
     private val fileExtensionExtractor: FileExtensionExtractor,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt
index d406a34567..88473a8fe2 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt
@@ -9,7 +9,7 @@ package io.element.android.libraries.mediaviewer.impl.gallery
 
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.RoomScope
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import javax.inject.Inject
@@ -21,7 +21,7 @@ interface MediaItemsPostProcessor {
     ): AsyncData<ImmutableList<MediaItem>>
 }
 
-@ContributesBinding(AppScope::class)
+@ContributesBinding(RoomScope::class)
 class DefaultMediaItemsPostProcessor @Inject constructor(
 ) : MediaItemsPostProcessor {
     override fun process(
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaItemsFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaItemsFactory.kt
index d8531cf230..aca0e6e477 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaItemsFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/TimelineMediaItemsFactory.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.androidutils.diff.DefaultDiffCacheInvalidato
 import io.element.android.libraries.androidutils.diff.DiffCacheUpdater
 import io.element.android.libraries.androidutils.diff.MutableListDiffCache
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.collections.immutable.ImmutableList
@@ -33,7 +33,7 @@ interface TimelineMediaItemsFactory {
     suspend fun onCanPaginate()
 }
 
-@ContributesBinding(AppScope::class)
+@ContributesBinding(RoomScope::class)
 class DefaultTimelineMediaItemsFactory @Inject constructor(
     private val dispatchers: CoroutineDispatchers,
     private val virtualItemFactory: VirtualItemFactory,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt
index f8a952cbd4..9f541b6e16 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/VirtualItemFactory.kt
@@ -9,7 +9,7 @@ package io.element.android.libraries.mediaviewer.impl.gallery
 
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.dateformatter.api.DaySeparatorFormatter
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
 import javax.inject.Inject
@@ -18,7 +18,7 @@ interface VirtualItemFactory {
     fun create(timelineItem: MatrixTimelineItem.Virtual): MediaItem?
 }
 
-@ContributesBinding(AppScope::class)
+@ContributesBinding(RoomScope::class)
 class DefaultVirtualItemFactory @Inject constructor(
     private val daySeparatorFormatter: DaySeparatorFormatter,
 ) : VirtualItemFactory {