diff --git a/lib/controllers/message_controller.dart b/lib/controllers/message_controller.dart
index dc92ffb..3f5a22a 100644
--- a/lib/controllers/message_controller.dart
+++ b/lib/controllers/message_controller.dart
@@ -68,7 +68,10 @@ class MessageController extends AsyncNotifier<Message?> {
       "body": newContent?["body"] ?? content["body"],
       "eventType": type,
       "avatarUrl": author?.content["avatar_url"],
-      "editSource": event.localContent?.editSource,
+      "editSource":
+          event.localContent?.editSource ??
+          newContent?["body"] ??
+          content["body"],
       "displayName": author?.content["displayname"]?.isNotEmpty == true
           ? author?.content["displayname"]
           : event.authorId.substring(1).split(":")[0],
diff --git a/lib/widgets/chat_page/chat_box.dart b/lib/widgets/chat_page/chat_box.dart
index ec6c4d6..46c8599 100644
--- a/lib/widgets/chat_page/chat_box.dart
+++ b/lib/widgets/chat_page/chat_box.dart
@@ -34,7 +34,7 @@ class ChatBox extends HookConsumerWidget {
     if (relationType == RelationType.edit &&
         relatedMessage is TextMessage &&
         controller.value.text.isEmpty) {
-      controller.value.text = relatedMessage?.metadata?["editSource"];
+      controller.value.text = relatedMessage?.metadata?["editSource"] ?? "";
     }
 
     void send() {