diff --git a/static/js/player.js b/static/js/player.js
index 966b60d7..427ab916 100644
--- a/static/js/player.js
+++ b/static/js/player.js
@@ -380,6 +380,10 @@ audioPlayerEl.addEventListener("timeupdate", (event) => {
 audioPlayerEl.addEventListener("ended", () => {
   switch (loopModes[currentLoopIdx].mode) {
     case "OFF":
+      if (currentPlaylistPlayer) {
+        currentPlaylistPlayer.next(shuffleSongs, false);
+        return;
+      }
       stopMuzikk();
       break;
     case "ONCE":