diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
index 72278f7f7..13063a752 100644
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -51,7 +51,7 @@ RowLayout {
         Layout.alignment: Qt.AlignTop
 
         visible: showAuthor && Config.showAvatarInTimeline
-        name: author.name
+        name: author.name ?? author.displayName
         source: author.avatarMediaId ? ("image://mxc/" + author.avatarMediaId) : ""
         color: author.color