diff --git a/src/Structures/Base/BasePlayer.ts b/src/Structures/Base/BasePlayer.ts
index ccf5680..2f4860a 100644
--- a/src/Structures/Base/BasePlayer.ts
+++ b/src/Structures/Base/BasePlayer.ts
@@ -1,10 +1,16 @@
 import { GatewayVoiceServerUpdateDispatch, GatewayVoiceStateUpdateDispatch } from 'discord-api-types/gateway/v9';
+import { Snowflake } from 'discord-api-types/globals';
 import { WebsocketOpEnum } from 'lavalink-api-types';
 import { KirishimaPlayerOptions, KirishimaNode, createVoiceChannelJoinPayload, Kirishima } from '../..';
 
 export class BasePlayer {
-	public voiceServer: GatewayVoiceServerUpdateDispatch['d'] | undefined;
-	public voiceState: GatewayVoiceStateUpdateDispatch['d'] | undefined;
+	public get voiceState() {
+		return this.node.voiceStates.get(this.options.guildId);
+	}
+
+	public get voiceServer() {
+		return this.node.voiceServers.get(this.options.guildId);
+	}
 
 	public constructor(public options: KirishimaPlayerOptions, public kirishima: Kirishima, public node: KirishimaNode) {}
 
@@ -19,18 +25,36 @@ export class BasePlayer {
 	}
 
 	public async setServerUpdate(packet: GatewayVoiceServerUpdateDispatch) {
-		this.voiceServer = packet.d;
-		if (!this.voiceState?.session_id) return;
-
-		await this.node.ws.send({
-			op: WebsocketOpEnum.VOICE_UPDATE,
-			guildId: this.voiceServer.guild_id,
-			sessionId: this.voiceState.session_id,
-			event: this.voiceServer
-		});
+		this.node.voiceServers.set(packet.d.guild_id, packet.d);
+		return this.sendVoiceUpdate(packet.d.guild_id);
+	}
+
+	public async setStateUpdate(packet: GatewayVoiceStateUpdateDispatch) {
+		if (packet.d.user_id !== this.kirishima.options.clientId) return;
+
+		if (packet.d.channel_id && packet.d.guild_id) {
+			this.node.voiceStates.set(packet.d.guild_id, packet.d);
+			return this.sendVoiceUpdate(packet.d.guild_id);
+		}
+
+		if (packet.d.guild_id) {
+			this.node.voiceServers.delete(packet.d.guild_id);
+			this.node.voiceStates.delete(packet.d.guild_id);
+			await this.connect();
+		}
 	}
 
-	public setStateUpdate(packet: GatewayVoiceStateUpdateDispatch) {
-		this.voiceState = packet.d;
+	public async sendVoiceUpdate(guildId: Snowflake) {
+		const voiceState = this.node.voiceStates.get(guildId);
+		const event = this.node.voiceServers.get(guildId);
+
+		if (event && voiceState) {
+			await this.node.ws.send({
+				op: WebsocketOpEnum.VOICE_UPDATE,
+				guildId,
+				sessionId: voiceState.session_id,
+				event
+			});
+		}
 	}
 }
diff --git a/src/Structures/KirishimaNode.ts b/src/Structures/KirishimaNode.ts
index 93bf153..0706a81 100644
--- a/src/Structures/KirishimaNode.ts
+++ b/src/Structures/KirishimaNode.ts
@@ -6,12 +6,16 @@ import type { Kirishima } from './Kirishima';
 import { GatewayVoiceServerUpdateDispatch, GatewayVoiceStateUpdateDispatch } from 'discord-api-types/gateway/v9';
 import { LavalinkStatsPayload, WebsocketOpEnum } from 'lavalink-api-types';
 import { BasePlayer } from './Base/BasePlayer';
+import Collection from '@discordjs/collection';
+import { Snowflake } from 'discord-api-types/globals';
 
 export class KirishimaNode {
 	public ws!: Gateway;
 	public rest!: REST;
 	public stats: LavalinkStatsPayload | undefined;
 	public reconnect: { attempts: number; timeout?: NodeJS.Timeout } = { attempts: 0 };
+	public voiceServers: Collection<Snowflake, GatewayVoiceServerUpdateDispatch['d']> = new Collection();
+	public voiceStates: Collection<Snowflake, GatewayVoiceStateUpdateDispatch['d']> = new Collection();
 	public constructor(public options: KirishimaNodeOptions, public kirishima: Kirishima) {}
 
 	public get connected() {
@@ -107,7 +111,7 @@ export class KirishimaNode {
 	public async handleVoiceStateUpdate(packet: GatewayVoiceStateUpdateDispatch) {
 		const player = (await this.kirishima.options.fetchPlayer!(packet.d.guild_id!)) as BasePlayer;
 		if (player) {
-			player.setStateUpdate(packet);
+			await player.setStateUpdate(packet);
 		}
 	}
 }