diff --git a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
index 98dc6f1c42..31df13df20 100644
--- a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
+++ b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
@@ -202,7 +202,9 @@ internal override void Update(ClientState state, Model model)
                 var members = model.Resolved.Value.Members.IsSpecified
                     ? model.Resolved.Value.Members.Value.Select(x =>
                     {
-                        x.Value.User = model.Resolved.Value.Users.Value.GetValueOrDefault(x.Key);
+                        x.Value.User = model.Resolved.Value.Users.Value.TryGetValue(x.Key, out var user)
+                            ? user
+                            : null;
 
                         return RestGuildUser.Create(Discord, guild, x.Value);
                     }).ToImmutableArray()