diff --git a/Xiao.js b/Xiao.js
index 5a421d37..ddb9fac2 100644
--- a/Xiao.js
+++ b/Xiao.js
@@ -238,10 +238,11 @@ client.on('guildMemberRemove', async member => {
 
 client.on('voiceStateUpdate', (oldState, newState) => {
 	if (newState.id !== client.user.id || oldState.id !== client.user.id) return;
-	const dispatcher = client.dispatchers.get(newState.channelID);
+	if (newState.channel) return;
+	const dispatcher = client.dispatchers.get(oldState.guild.id);
 	if (!dispatcher) return;
 	dispatcher.end();
-	client.dispatchers.delete(newState.channelID);
+	client.dispatchers.delete(oldState.guild.id);
 });
 
 client.on('disconnect', event => {