diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 05bfa3c2583..97d87114c6e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -3786,7 +3786,7 @@ class ConversationFragment :
         body = result.body,
         mentions = result.mentions,
         bodyRanges = result.bodyRanges,
-        messageToEdit = null,
+        messageToEdit = inputPanel.editMessageId,
         quote = if (result.isViewOnce) null else inputPanel.quote.orNull(),
         scheduledDate = result.scheduledTime,
         slideDeck = null,