diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index e19aab173..940ede2f9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -3416,7 +3416,12 @@ public void playNext() {
         if (playQueue == null) {
             return;
         }
-
+        
+        if (playQueue.size() == 1)
+        {
+            fastForward();
+            return;
+        }
         saveStreamProgressState();
         playQueue.offsetIndex(+1);
         triggerProgressUpdate();