diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 7eb83bcf3d..b4ee6fae7d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -4170,6 +4170,7 @@ public class ConversationParentFragment extends Fragment
   @Override
   public void onExitEditMode() {
     updateToggleButtonState();
+    draftViewModel.deleteMessageEditDraft();
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftViewModel.kt
index a33a56cd41..491e94dae3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftViewModel.kt
@@ -84,6 +84,12 @@ class DraftViewModel @JvmOverloads constructor(
     }
   }
 
+  fun deleteMessageEditDraft() {
+    store.update {
+      saveDrafts(it.copy(textDraft = null, bodyRangesDraft = null, messageEditDraft = null))
+    }
+  }
+
   fun setTextDraft(text: String, mentions: List<Mention>, styleBodyRanges: BodyRangeList?) {
     store.update {
       val mentionRanges: BodyRangeList? = MentionUtil.mentionsToBodyRangeList(mentions)