diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
index 637c62286..6530bca91 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackService.kt
@@ -315,9 +315,21 @@ class PlaybackService :
     }
 
     override fun next() {
-        player.seekToNext()
-        if (!playbackSettings.rememberPause) {
-            player.play()
+        // Replicate the old pseudo-circular queue behavior when no repeat option is implemented.
+        // Basically, you can't skip back and wrap around the queue, but you can skip forward and
+        // wrap around the queue, albeit playback will be paused.
+        if (player.repeatMode != Player.REPEAT_MODE_OFF || player.hasNextMediaItem()) {
+            player.seekToNext()
+            if (!playbackSettings.rememberPause) {
+                player.play()
+            }
+        } else {
+            goto(0)
+            // TODO: Dislike the UX implications of this, I feel should I bite the bullet
+            //  and switch to dynamic skip enable/disable?
+            if (!playbackSettings.rememberPause) {
+                player.pause()
+            }
         }
         playbackManager.ack(this, StateAck.IndexMoved)
         // Deferred save is handled on position discontinuity