diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java
index 84a0b12478..5704ecc908 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java
@@ -97,7 +97,7 @@ final class VideoThumbnailsExtractor {
 
         doExtract(extractor, decoder, outputSurface, outputWidthRotated, outputHeightRotated, duration, thumbnailCount, callback);
       }
-    } catch (IOException | TranscodingException e) {
+    } catch (IOException | TranscodingException | MediaCodec.CodecException e) {
       Log.w(TAG, e);
       callback.failed();
     } finally {