diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 82b3605c5..b79eeb099 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -2245,6 +2245,12 @@ namespace Discord.WebSocket
 
                                     var channel = (SocketThreadChannel)guild.GetChannel(data.Id);
 
+                                    if (channel == null)
+                                    {
+                                        await UnknownChannelAsync(type, data.Id);
+                                        return;
+                                    }
+
                                     var before = channel.Clone();
                                     channel.Update(State, data);