diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
index d4809b4399..d241cad7cd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt
@@ -136,7 +136,9 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a
 
   override fun onDismiss(dialog: DialogInterface) {
     super.onDismiss(dialog)
-    viewModel.setMessage(binding.content.addAMessageInput.text)
+    if (isResumed) {
+      viewModel.setMessage(binding.content.addAMessageInput.text)
+    }
   }
 
   override fun onKeyboardHidden() {