diff --git a/commands/stop.js b/commands/stop.js
index 0259dc0..ccad10d 100644
--- a/commands/stop.js
+++ b/commands/stop.js
@@ -29,7 +29,6 @@ exports.run = async (client, message) => {
   guild.queue = []
   guild.playing = false
   guild.paused = false
-  guild.dispatcher = null
   guild.skippers = []
 
   message.channel.send('Playback stopped!')
diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js
index 9850f01..d252946 100644
--- a/events/voiceStateUpdate.js
+++ b/events/voiceStateUpdate.js
@@ -6,6 +6,15 @@ module.exports = (client, oldState, newState) => {
   if (newState.channelID !== oldState.channelID) {
     const guild = music.getGuild(newState.guild.id)
 
+    // Reset queue, dispatcher, etc if Woomy is forcibly disconnected from the queue
+    if (!guild.voiceChannel.members.get(client.user.id) && guild.queue.length > 0) {
+      guild.queue = []
+      guild.playing = false
+      guild.paused = false
+      guild.skippers = []
+    }
+
+    // Auto-disconnect feature
     if (guild.playing && guild.voiceChannel.id === oldState.channelID) {
       if (guild.voiceChannel.members.filter(member => !member.user.bot).size < 1) {
         guild.autoDisconnect = true