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 a739ced8b6..6641dd501d 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
@@ -84,7 +84,14 @@ final class VideoThumbnailsExtractor {
         decoder.configure(mediaFormat, outputSurface.getSurface(), null, 0);
         decoder.start();
 
-        long duration = mediaFormat.getLong(MediaFormat.KEY_DURATION);
+        long duration = 0;
+
+        if (mediaFormat.containsKey(MediaFormat.KEY_DURATION)) {
+          duration = mediaFormat.getLong(MediaFormat.KEY_DURATION);
+        } else {
+          Log.w(TAG, "Video is missing duration!");
+        }
+
         callback.durationKnown(duration);
 
         doExtract(extractor, decoder, outputSurface, outputWidthRotated, outputHeightRotated, duration, thumbnailCount, callback);
@@ -179,4 +186,4 @@ final class VideoThumbnailsExtractor {
     }
     Log.i(TAG, "doExtract finished");
   }
-}
+}
\ No newline at end of file