diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index bbf015424..9e62c3010 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -1407,7 +1407,7 @@ public final class ComposeActivity extends BaseActivity implements ComposeOption
              * it from the queue, then don't display this error message. */
             displayTransientError(R.string.error_media_upload_sending);
         }
-        if (finishingUploadDialog != null) {
+        if (finishingUploadDialog != null && finishingUploadDialog.isShowing()) {
             finishingUploadDialog.cancel();
         }
         if (!isCanceled) {