diff --git a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
index 769647cf6..bc5412bc1 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/PlaylistAdapter.kt
@@ -83,7 +83,7 @@ class PlaylistAdapter(
             videoInfo.text = streamItem.uploaderName
             channelImage.isGone = true
 
-            thumbnailDuration.setFormattedDuration(streamItem.duration!!, streamItem.isShort)
+            thumbnailDuration.setFormattedDuration(streamItem.duration ?: -1, streamItem.isShort)
 
             ImageHelper.loadImage(streamItem.thumbnail, thumbnail)
 
@@ -115,7 +115,7 @@ class PlaylistAdapter(
                 videoInfo.updatePadding(top = extraPadding, bottom = extraPadding)
             }
 
-            watchProgress.setWatchProgressLength(videoId, streamItem.duration)
+            streamItem.duration?.let { watchProgress.setWatchProgressLength(videoId, it) }
         }
     }