diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 5e19e14e6..4476b78c4 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -1328,7 +1328,13 @@ namespace Discord.WebSocket
 
                                         var user = guild.GetUser(data.User.Id);
                                         if (user == null)
+                                        {
+                                            if (data.Status == UserStatus.Offline)
+                                            {
+                                                return;
+                                            }
                                             user = guild.AddOrUpdateUser(data);
+                                        }
                                         else
                                         {
                                             var globalBefore = user.GlobalUser.Clone();