diff --git a/src/main/java/noppes/npcs/client/controllers/MusicController.java b/src/main/java/noppes/npcs/client/controllers/MusicController.java
index e3a2213b8..fc2d9369b 100644
--- a/src/main/java/noppes/npcs/client/controllers/MusicController.java
+++ b/src/main/java/noppes/npcs/client/controllers/MusicController.java
@@ -56,16 +56,22 @@ public class MusicController {
 
     public void stopMusic() {
         SoundHandler soundHandler = Minecraft.getMinecraft().getSoundHandler();
-        if (soundHandler != null) {
+        if (this.playingSound != null) {
+            if (soundHandler != null) {
+                try {
+                    soundHandler.stopSound(this.playingSound);
+                } catch (Exception ignored) {
+                }
+            }
+            this.playingSound.stopSound();
+            this.sounds.remove(this.playingSound.sound);
+            this.playingSound = null;
+        } else if (soundHandler != null) {
             try {
                 soundHandler.stopSounds();
             } catch (Exception ignored) {
             }
         }
-        if (this.playingSound != null) {
-            this.playingSound.stopSound();
-            this.playingSound = null;
-        }
     }
 
     public void playMusicJukebox(String music, Entity entity, int offRange) {