diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/MediaCodecCompat.kt b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/MediaCodecCompat.kt
index 931c2784bc..963badbeb2 100644
--- a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/MediaCodecCompat.kt
+++ b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/MediaCodecCompat.kt
@@ -39,6 +39,13 @@ object MediaCodecCompat {
       } else {
         findBackupDecoderForDolbyVision(inputFormat) ?: throw IOException("Can't create decoder for $mimeType!")
       }
+    } else if (mimeType != null) {
+      try {
+        val decoder = MediaCodec.createDecoderByType(mimeType)
+        return Pair(decoder, inputFormat)
+      } catch (iae: IllegalArgumentException) {
+        throw IOException("Can't create decoder for $mimeType, which is not a valid MIME type.", iae)
+      }
     }
 
     throw IOException("Can't create decoder for $mimeType!")