diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index bb2f8332f..954c7610b 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1099,6 +1099,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
           boolean doSend = true;
           if (recompress==DcMsg.DC_MSG_VIDEO) {
             Util.runOnMain(() -> {
+              if (isFinishing()) return;
               progressDialog = ProgressDialog.show(
                                                    ConversationActivity.this,
                                                    "",