diff --git a/devtools_options.yaml b/devtools_options.yaml
new file mode 100644
index 0000000..fa0b357
--- /dev/null
+++ b/devtools_options.yaml
@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
diff --git a/lib/controllers/message_controller.dart b/lib/controllers/message_controller.dart
index e92e53d..47e603c 100644
--- a/lib/controllers/message_controller.dart
+++ b/lib/controllers/message_controller.dart
@@ -70,7 +70,7 @@ class MessageController extends AsyncNotifier<Message?> {
       "body": newContent?["body"] ?? content["body"],
       "eventType": type,
       "avatarUrl": author?.content["avatar_url"],
-      "displayName": author?.content["displayname"] ?? event.stateKey,
+      "displayName": author?.content["displayname"] ?? event.authorId,
       "txnId": config.event.transactionId,
     };