diff --git a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
index 5ea353802..c4563e994 100644
--- a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
+++ b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
@@ -181,7 +181,7 @@ namespace Discord.WebSocket
 
             if (model.Thread.IsSpecified)
             {
-                Thread = SocketThreadChannel.Create(guild, state, model.Thread.Value);
+                Thread = guild!.AddOrUpdateChannel(state, model.Thread.Value) as SocketThreadChannel;
             }
         }