diff --git a/package-lock.json b/package-lock.json
index c4b7cfe7..ad3a9bf1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9377,7 +9377,7 @@
 		},
 		"node_modules/spacebar-webrtc-types": {
 			"version": "1.0.1",
-			"resolved": "git+ssh://git@github.com/dank074/spacebar-webrtc-types.git#45c9bfaa599b7f7fa2bb4965ce9cd57b2362e150",
+			"resolved": "git+ssh://git@github.com/dank074/spacebar-webrtc-types.git#fcab265b1c2c4ea4426c8bf5832ce75edbf1741d",
 			"dev": true,
 			"license": "ISC"
 		},
diff --git a/src/webrtc/opcodes/Identify.ts b/src/webrtc/opcodes/Identify.ts
index 65bfad06..f39958d4 100644
--- a/src/webrtc/opcodes/Identify.ts
+++ b/src/webrtc/opcodes/Identify.ts
@@ -95,7 +95,7 @@ export async function onIdentify(this: WebRtcWebSocket, data: VoicePayload) {
 	this.type = type;
 
 	const voiceRoomId = type === "stream" ? server_id : voiceState!.channel_id;
-	this.webRtcClient = mediaServer.join(
+	this.webRtcClient = await mediaServer.join(
 		voiceRoomId,
 		this.user_id,
 		this,
diff --git a/src/webrtc/opcodes/Video.ts b/src/webrtc/opcodes/Video.ts
index a126712e..ca597a33 100644
--- a/src/webrtc/opcodes/Video.ts
+++ b/src/webrtc/opcodes/Video.ts
@@ -69,7 +69,7 @@ export async function onVideo(this: WebRtcWebSocket, payload: VoicePayload) {
 			console.log(
 				`[${this.user_id}] publishing new audio track ssrc:${d.audio_ssrc}`,
 			);
-			this.webRtcClient.publishTrack("audio", {
+			await this.webRtcClient.publishTrack("audio", {
 				audio_ssrc: d.audio_ssrc,
 			});
 		}
@@ -84,7 +84,10 @@ export async function onVideo(this: WebRtcWebSocket, payload: VoicePayload) {
 				console.log(
 					`[${client.user_id}] subscribing to audio track ssrcs: ${d.audio_ssrc}`,
 				);
-				client.subscribeToTrack(this.webRtcClient.user_id, "audio");
+				await client.subscribeToTrack(
+					this.webRtcClient.user_id,
+					"audio",
+				);
 
 				clientsThatNeedUpdate.add(client);
 			}
@@ -98,7 +101,7 @@ export async function onVideo(this: WebRtcWebSocket, payload: VoicePayload) {
 			console.log(
 				`[${this.user_id}] publishing new video track ssrc:${d.video_ssrc}`,
 			);
-			this.webRtcClient.publishTrack("video", {
+			await this.webRtcClient.publishTrack("video", {
 				video_ssrc: d.video_ssrc,
 				rtx_ssrc: d.rtx_ssrc,
 			});
@@ -114,7 +117,10 @@ export async function onVideo(this: WebRtcWebSocket, payload: VoicePayload) {
 				console.log(
 					`[${client.user_id}] subscribing to video track ssrc: ${d.video_ssrc}`,
 				);
-				client.subscribeToTrack(this.webRtcClient.user_id, "video");
+				await client.subscribeToTrack(
+					this.webRtcClient.user_id,
+					"video",
+				);
 
 				clientsThatNeedUpdate.add(client);
 			}
@@ -158,16 +164,19 @@ export async function subscribeToProducers(
 	);
 
 	await Promise.all(
-		Array.from(clients).map((client) => {
+		Array.from(clients).map(async (client) => {
 			let needsUpdate = false;
 
-			if (client.user_id === this.user_id) return Promise.resolve(); // cannot subscribe to self
+			if (client.user_id === this.user_id) return; // cannot subscribe to self
 
 			if (
 				client.isProducingAudio() &&
 				!this.webRtcClient!.isSubscribedToTrack(client.user_id, "audio")
 			) {
-				this.webRtcClient!.subscribeToTrack(client.user_id, "audio");
+				await this.webRtcClient!.subscribeToTrack(
+					client.user_id,
+					"audio",
+				);
 				needsUpdate = true;
 			}
 
@@ -175,17 +184,20 @@ export async function subscribeToProducers(
 				client.isProducingVideo() &&
 				!this.webRtcClient!.isSubscribedToTrack(client.user_id, "video")
 			) {
-				this.webRtcClient!.subscribeToTrack(client.user_id, "video");
+				await this.webRtcClient!.subscribeToTrack(
+					client.user_id,
+					"video",
+				);
 				needsUpdate = true;
 			}
 
-			if (!needsUpdate) return Promise.resolve();
+			if (!needsUpdate) return;
 
 			const ssrcs = this.webRtcClient!.getOutgoingStreamSSRCsForUser(
 				client.user_id,
 			);
 
-			return Send(this, {
+			await Send(this, {
 				op: VoiceOPCodes.VIDEO,
 				d: {
 					user_id: client.user_id,