diff --git a/lib/src/main/java/com/otaliastudios/transcoder/internal/codec/Decoder.kt b/lib/src/main/java/com/otaliastudios/transcoder/internal/codec/Decoder.kt
index 89bc151a..0c60fb0a 100644
--- a/lib/src/main/java/com/otaliastudios/transcoder/internal/codec/Decoder.kt
+++ b/lib/src/main/java/com/otaliastudios/transcoder/internal/codec/Decoder.kt
@@ -100,7 +100,9 @@ class Decoder(
                 }
             }
             log.i("Using codec: $codecName for format: $format")
-            return createByCodecName(codecName!!)
+            if (codecName != null) {
+                return createByCodecName(codecName)
+            }
         }
         return createDecoderByType(mime)
     }