diff --git a/client/init/proximity.lua b/client/init/proximity.lua
index c4812cd..52b1029 100644
--- a/client/init/proximity.lua
+++ b/client/init/proximity.lua
@@ -35,8 +35,15 @@ function addNearbyPlayers()
 	currentTargets = {}
 	MumbleClearVoiceTargetChannels(voiceTarget)
 	if LocalPlayer.state.disableProximity then return end
-	MumbleAddVoiceChannelListen(LocalPlayer.state.assignedChannel)
-	MumbleAddVoiceTargetChannel(voiceTarget, LocalPlayer.state.assignedChannel)
+
+	local assignedChannel = LocalPlayer.state.assignedChannel
+	if assignedChannel and assignedChannel ~= 0 then
+		local channel = MumbleGetVoiceChannelFromServerId(playerServerId)
+		if channel ~= -1 and channel == assignedChannel then
+			MumbleAddVoiceChannelListen(assignedChannel)
+			MumbleAddVoiceTargetChannel(voiceTarget, assignedChannel)
+		end
+	end
 
 	for source, _ in pairs(callData) do
 		if source ~= playerServerId then