diff --git a/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift b/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift
index ea4488244..743fec34f 100644
--- a/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift
+++ b/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift
@@ -29,10 +29,10 @@ class AvatarService: AvatarServiceProtocol {
         static let mimeType = "image/jpeg"
         static let thumbnailMethod = MXThumbnailingMethodCrop
     }
+    // bwi: #5133 fix crash: make mediaManager optional
+    private let mediaManager: MXMediaManager?
     
-    private let mediaManager: MXMediaManager
-    
-    init(mediaManager: MXMediaManager) {
+    init(mediaManager: MXMediaManager?) {
         self.mediaManager = mediaManager
     }
     
@@ -59,7 +59,7 @@ class AvatarService: AvatarServiceProtocol {
                 promise(.success(imageUp))
             }
         
-            self.mediaManager.downloadThumbnail(
+            self.mediaManager?.downloadThumbnail(
                 fromMatrixContentURI: mxContentUri,
                 withType: Constants.mimeType,
                 inFolder: nil,