diff --git a/mumbleBot.py b/mumbleBot.py
index 7a078d3..f1bc8ef 100644
--- a/mumbleBot.py
+++ b/mumbleBot.py
@@ -647,13 +647,16 @@ class MumbleBot:
         # Kill the ffmpeg thread and empty the playlist
         self.interrupt()
         var.playlist.clear()
+        self.wait_for_ready = False
         self.log.info("bot: music stopped. playlist trashed.")
 
     def stop(self):
         self.interrupt()
         self.is_pause = True
-        var.playlist.next()
-        self.wait_for_ready = True
+        if len(var.playlist) > 0:
+            self.wait_for_ready = True
+        else:
+            self.wait_for_ready = False
         self.log.info("bot: music stopped.")
 
     def interrupt(self):