diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index 372744e71c..49363da430 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -543,7 +543,8 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
 
     if (fragment != null) {
       processMedia(fragment.getAllMedia(), fragment.getSavedState(), processedMedia -> {
-        sendMessages(recipients, processedMedia, composeText.getTextTrimmed(), transport);
+        String body = viewModel.isViewOnce() ? "" : composeText.getTextTrimmed();
+        sendMessages(recipients, processedMedia, body, transport);
       });
     } else {
       throw new AssertionError("No editor fragment available!");