diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/AutoMediaBrowserService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/AutoMediaBrowserService.kt
index e834cd42..5bdfe45b 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/AutoMediaBrowserService.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/AutoMediaBrowserService.kt
@@ -1085,7 +1085,8 @@ class AutoMediaBrowserService : MediaBrowserServiceCompat() {
             shuffle = false,
             newPlaylist = false
         )
-        mediaPlayerController.next()
+        if (mediaPlayerController.playlistSize > 1) mediaPlayerController.next()
+        else mediaPlayerController.play()
     }
 
     private fun <T> callWithErrorHandling(function: () -> T): T? {