diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
index 101b4dd39d..9fff2637e2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
@@ -109,10 +109,10 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
           Util.copy(inputStream, outputStream);
           MediaScannerConnection.scanFile(context, new String[]{mediaUri.getPath()}, new String[]{contentType}, null);
         }
-      }
-
-      try (OutputStream outputStream = context.getContentResolver().openOutputStream(mediaUri)) {
-        Util.copy(inputStream, outputStream);
+      } else {
+        try (OutputStream outputStream = context.getContentResolver().openOutputStream(mediaUri)) {
+          Util.copy(inputStream, outputStream);
+        }
       }
     }