diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt
index d914c6b3d..2e54a491b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt
@@ -1931,12 +1931,8 @@ class VideoDetailFragment :
     }
 
     private fun findQueueInStack(queue: PlayQueue): StackItem? {
-        stack.descendingIterator().forEach { item ->
-            if (item?.playQueue == queue) {
-                return@findQueueInStack item
-            }
-        }
-        return null
+        return stack.descendingIterator().asSequence()
+            .firstOrNull { it?.playQueue?.equals(queue) == true }
     }
 
     private fun replaceQueueIfUserConfirms(onAllow: Runnable) {