diff --git a/lib/controllers/message_controller.dart b/lib/controllers/message_controller.dart
index 47e603c..b6e326b 100644
--- a/lib/controllers/message_controller.dart
+++ b/lib/controllers/message_controller.dart
@@ -70,7 +70,9 @@ class MessageController extends AsyncNotifier<Message?> {
       "body": newContent?["body"] ?? content["body"],
       "eventType": type,
       "avatarUrl": author?.content["avatar_url"],
-      "displayName": author?.content["displayname"] ?? event.authorId,
+      "displayName": author?.content["displayname"]?.isNotEmpty == true
+          ? author?.content["displayname"]
+          : event.authorId.substring(1).split(":")[0],
       "txnId": config.event.transactionId,
     };