diff --git a/native/chat/chat-input-bar.react.js b/native/chat/chat-input-bar.react.js
--- a/native/chat/chat-input-bar.react.js
+++ b/native/chat/chat-input-bar.react.js
@@ -690,6 +690,9 @@
 
   updateText = (text: string) => {
     this.setState({ text, textEdited: true });
+    if (this.isEditMode()) {
+      return;
+    }
     this.saveDraft(text);
   };
 
@@ -788,7 +791,15 @@
   };
 
   onPressExitEditMode = () => {
-    this.props.inputState?.setEditedMessage(null);
+    this.exitEditMode();
+  };
+
+  exitEditMode = () => {
+    this.props.inputState?.setEditedMessage(null, () => {
+      this.updateText(this.props.draft);
+      this.focusAndUpdateButtonsVisibility();
+      this.updateSendButton(this.props.draft);
+    });
   };
 
   onPressJoin = () => {