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 5704ecc90..370d295b3 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
@@ -109,6 +109,8 @@ final class VideoThumbnailsExtractor {
           decoder.stop();
         } catch (MediaCodec.CodecException codecException) {
           Log.w(TAG, "Decoder stop failed: " + codecException.getDiagnosticInfo(), codecException);
+        } catch (IllegalStateException ise) {
+          Log.w(TAG, "Decoder stop failed", ise);
         }
         decoder.release();
       }