diff --git a/commands/music.js b/commands/music.js
index ecf444a..e4be319 100644
--- a/commands/music.js
+++ b/commands/music.js
@@ -187,11 +187,7 @@ module.exports = {
         }
         break
       case 'stop':
-        try {
-          bot.tellraw(selector, { text: 'Cleared the song queue' })
-        } catch (e) {
-          return
-        }
+        bot.tellraw(selector, { text: 'Cleared the song queue' })
         bot.music.stop()
         break
       case 'skip':
diff --git a/plugins/music.js b/plugins/music.js
index b556db4..5725f00 100644
--- a/plugins/music.js
+++ b/plugins/music.js
@@ -88,6 +88,7 @@ function inject (bot) {
           return
         }
         bot.music.queue.shift()
+        bot.music.song = null // useless?
         if (!bot.music.queue[0]) {
           bot.music.stop()
           return