diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
index 874da06acb..91f761bda9 100755
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
@@ -52,6 +52,7 @@ import java.io.OutputStreamWriter
 import java.net.HttpURLConnection
 import java.util.Locale
 import javax.inject.Inject
+import javax.inject.Provider
 
 /**
  * BugReporter creates and sends the bug reports.
@@ -62,7 +63,7 @@ class DefaultBugReporter @Inject constructor(
     private val screenshotHolder: ScreenshotHolder,
     private val crashDataStore: CrashDataStore,
     private val coroutineDispatchers: CoroutineDispatchers,
-    private val okHttpClient: OkHttpClient,
+    private val okHttpClient: Provider<OkHttpClient>,
     /*
     private val activeSessionHolder: ActiveSessionHolder,
     private val versionProvider: VersionProvider,
@@ -339,7 +340,7 @@ class DefaultBugReporter @Inject constructor(
 
                 // trigger the request
                 try {
-                    mBugReportCall = okHttpClient.newCall(request)
+                    mBugReportCall = okHttpClient.get().newCall(request)
                     response = mBugReportCall!!.execute()
                     responseCode = response.code
                 } catch (e: Exception) {
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
index 9038e03611..c5b7f1ed44 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
@@ -26,16 +26,17 @@ import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.matrix.api.MatrixClient
 import okhttp3.OkHttpClient
 import javax.inject.Inject
+import javax.inject.Provider
 
 class LoggedInImageLoaderFactory @Inject constructor(
     @ApplicationContext private val context: Context,
     private val matrixClient: MatrixClient,
-    private val okHttpClient: OkHttpClient,
+    private val okHttpClient: Provider<OkHttpClient>,
 ) : ImageLoaderFactory {
     override fun newImageLoader(): ImageLoader {
         return ImageLoader
             .Builder(context)
-            .okHttpClient(okHttpClient)
+            .okHttpClient { okHttpClient.get() }
             .components {
                 // Add gif support
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
@@ -54,12 +55,12 @@ class LoggedInImageLoaderFactory @Inject constructor(
 
 class NotLoggedInImageLoaderFactory @Inject constructor(
     @ApplicationContext private val context: Context,
-    private val okHttpClient: OkHttpClient,
+    private val okHttpClient: Provider<OkHttpClient>,
 ) : ImageLoaderFactory {
     override fun newImageLoader(): ImageLoader {
         return ImageLoader
             .Builder(context)
-            .okHttpClient(okHttpClient)
+            .okHttpClient { okHttpClient.get() }
             .build()
     }
 }