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 92b3896da4..84a0b12478 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
@@ -105,7 +105,11 @@ final class VideoThumbnailsExtractor {
         outputSurface.release();
       }
       if (decoder != null) {
-        decoder.stop();
+        try {
+          decoder.stop();
+        } catch (MediaCodec.CodecException codecException) {
+          Log.w(TAG, "Decoder stop failed: " + codecException.getDiagnosticInfo(), codecException);
+        }
         decoder.release();
       }
       if (extractor != null) {