diff --git a/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt b/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
index a88e8011ff..9e73ea40dc 100644
--- a/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
+++ b/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
@@ -356,7 +356,7 @@ class OnlinePlayerService : LifecycleService() {
 
         saveWatchPosition()
 
-        if (!PlayerHelper.isAutoPlayEnabled(playlistId != null)) return
+        if (!PlayerHelper.isAutoPlayEnabled(playlistId != null) && nextId == null) return
 
         val nextVideo = nextId ?: PlayingQueue.getNext() ?: return