diff --git a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift
index 6808f0dd6..1a5f8f032 100644
--- a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift
+++ b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift
@@ -47,7 +47,10 @@ class AvatarViewModel: InjectableObject, ObservableObject {
             stableColorIndex(matrixItemId: matrixItemId, colorCount: colorCount)
         )
         
-        guard let mxContentUri = mxContentUri else { return }
+        guard let mxContentUri = mxContentUri, mxContentUri.count > 0 else {
+            return
+        }
+        
         avatarService.avatarImage(mxContentUri: mxContentUri, avatarSize: avatarSize)
             .sink { completion in
                 guard case let .failure(error) = completion else { return }