diff --git a/src/Discord.Net/Models/Message.cs b/src/Discord.Net/Models/Message.cs
index 8062fb82d..0634499da 100644
--- a/src/Discord.Net/Models/Message.cs
+++ b/src/Discord.Net/Models/Message.cs
@@ -157,7 +157,7 @@ namespace Discord
 			channel.AddMessage(this);
 			Channel = channel;
 
-			var user = _client.Users[_channelId, channel.Server?.Id];
+			var user = _client.Users[_userId, channel.Server?.Id];
 			//user.AddMessage(this);
 			User = user;
 		}