diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
index d4070b8ec6..904a6bf2ea 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
@@ -30,6 +30,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 import io.element.android.libraries.push.api.notifications.NotificationDrawerManager
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
 import io.element.android.services.appnavstate.api.AppNavigationStateService
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ImageLoaderHolder.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ImageLoaderHolder.kt
deleted file mode 100644
index 3f48922ca0..0000000000
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ImageLoaderHolder.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.libraries.push.impl.notifications
-
-import android.content.Context
-import coil.ImageLoader
-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.ApplicationContext
-import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.ui.media.LoggedInImageLoaderFactory
-import io.element.android.libraries.sessionstorage.api.observer.SessionListener
-import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
-import okhttp3.OkHttpClient
-import javax.inject.Inject
-import javax.inject.Provider
-
-interface ImageLoaderHolder {
-    fun get(client: MatrixClient): ImageLoader
-}
-
-@ContributesBinding(AppScope::class)
-@SingleIn(AppScope::class)
-class DefaultImageLoaderHolder @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val okHttpClient: Provider<OkHttpClient>,
-    private val sessionObserver: SessionObserver,
-) : ImageLoaderHolder {
-    private val map = mutableMapOf<SessionId, ImageLoader>()
-
-    init {
-        observeSessions()
-    }
-
-    private fun observeSessions() {
-        sessionObserver.addListener(object : SessionListener {
-            override suspend fun onSessionCreated(userId: String) = Unit
-
-            override suspend fun onSessionDeleted(userId: String) {
-                map.remove(SessionId(userId))
-            }
-        })
-    }
-
-    override fun get(client: MatrixClient): ImageLoader {
-        return synchronized(map) {
-            map.getOrPut(client.sessionId) {
-                LoggedInImageLoaderFactory(
-                    context = context,
-                    matrixClient = client,
-                    okHttpClient = okHttpClient,
-                ).newImageLoader()
-            }
-        }
-    }
-}
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeImageLoaderHolder.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeImageLoaderHolder.kt
index b6b3088a25..8c1f28e10d 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeImageLoaderHolder.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeImageLoaderHolder.kt
@@ -18,7 +18,7 @@ package io.element.android.libraries.push.impl.notifications.fake
 
 import coil.ImageLoader
 import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.push.impl.notifications.ImageLoaderHolder
+import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 
 class FakeImageLoaderHolder : ImageLoaderHolder {
     override fun get(client: MatrixClient): ImageLoader {