diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index 78505b451..355c3ab1f 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -368,9 +368,12 @@ namespace Discord
 					case "MESSAGE_UPDATE":
 						{
 							var data = e.Payload.ToObject<Events.MessageUpdate>(_serializer);
-							var msg = _messages.GetOrAdd(data.Id, data.ChannelId, data.Author.Id);
-							msg.Update(data);
-							RaiseEvent(nameof(MessageUpdated), () => RaiseMessageUpdated(msg));
+							var msg = _messages[data.Id];
+                            if (msg != null)
+							{
+								msg.Update(data);
+								RaiseEvent(nameof(MessageUpdated), () => RaiseMessageUpdated(msg));
+							}
 						}
 						break;
 					case "MESSAGE_DELETE":