diff --git a/Riot/Modules/Pills/PillProvider.swift b/Riot/Modules/Pills/PillProvider.swift
index 5f41c0d9a..60363bc47 100644
--- a/Riot/Modules/Pills/PillProvider.swift
+++ b/Riot/Modules/Pills/PillProvider.swift
@@ -267,7 +267,7 @@ struct PillProvider {
         let displayText: String
         let avatar: PillTextAttachmentItem
         if let roomMember {
-            displayText = VectorL10n.pillMessageFrom(roomMember.displayname)
+            displayText = VectorL10n.pillMessageFrom(roomMember.displayname ?? roomMember.userId)
             avatar = .avatar(url: roomMember.avatarUrl,
                              string: roomMember.displayname,
                              matrixId: roomMember.userId)