diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
index 819bcd507f..d5b780a52a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
@@ -314,6 +314,10 @@ public class MediaUtil {
     return isImageType(contentType) || isVideoType(contentType);
   }
 
+  public static boolean isImageVideoOrAudioType(String contentType) {
+    return isImageOrVideoType(contentType) || isAudioType(contentType);
+  }
+
   public static boolean isImageAndNotGif(@NonNull String contentType) {
     return isImageType(contentType) && !isGif(contentType);
   }
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 c07c93a464..f651acb663 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
@@ -184,6 +184,11 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
     String   extension = fileParts[1];
     String   mimeType  = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
 
+    if (MediaUtil.isOctetStream(mimeType) && MediaUtil.isImageVideoOrAudioType(contentType)) {
+      Log.d(TAG, "MimeTypeMap returned octet stream for media, changing to provided content type [" + contentType + "] instead.");
+      mimeType = contentType;
+    }
+
     ContentValues contentValues = new ContentValues();
     contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, fileName);
     contentValues.put(MediaStore.MediaColumns.MIME_TYPE, mimeType);