diff --git a/src/services/music/playerHandler.js b/src/services/music/playerHandler.js
index a58947a81c..9219750213 100644
--- a/src/services/music/playerHandler.js
+++ b/src/services/music/playerHandler.js
@@ -117,6 +117,11 @@ export function setupPlayerHandler(client) {
     client.riffy.on('queueEnd', async (player) => {
         try {
             const guildData = getGuildMusicData(player.guildId);
+
+            if (guildData.loop && guildData.loop !== 'none') {
+                return;
+            }
+
             clearUpdateInterval(guildData);
 
             if (guildData.autoplay) {