diff --git a/Riot/Modules/Pills/PillProvider.swift b/Riot/Modules/Pills/PillProvider.swift
index 077001106..5f41c0d9a 100644
--- a/Riot/Modules/Pills/PillProvider.swift
+++ b/Riot/Modules/Pills/PillProvider.swift
@@ -135,7 +135,7 @@ struct PillProvider {
         let isHighlighted = userId == session.myUserId
 
         let avatar: PillTextAttachmentItem
-        if avatarUrl == nil {
+        if roomMember == nil && user == nil {
             avatar = .asset(named: "pill_user",
                             parameters: .init(tintColor: PillAssetColor(uiColor: ThemeService.shared().theme.colors.secondaryContent),
                                               rawRenderingMode: UIImage.RenderingMode.alwaysOriginal.rawValue,