diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index fe80874801..872cc5e7c9 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -133,9 +133,10 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
     super.onPause();
     if (!isPassingAlongMedia && resolvedExtra != null) {
       PersistentBlobProvider.getInstance(this).delete(this, resolvedExtra);
-    }
-    if (!isFinishing()) {
-      finish();
+
+      if (!isFinishing()) {
+        finish();
+      }
     }
   }