diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index 734b1a59c..216ecb5d2 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -673,12 +673,12 @@ namespace Discord
 							var member = _members[data.UserId, data.GuildId];
 							if (member != null)
 							{
-								member.Update(data);
-								if (member.IsSpeaking)
+								if (data.ChannelId != member.VoiceChannelId && member.IsSpeaking)
 								{
 									member.IsSpeaking = false;
 									RaiseUserIsSpeaking(member, false);
 								}
+								member.Update(data);
 								RaiseUserVoiceStateUpdated(member);
 							}
 						}