diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 8eb33453de..1ad6be132e 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -317,7 +317,7 @@ namespace osu.Game.Overlays
 
             Debug.Assert(channel.Id == message.ChannelId);
 
-            if (currentChannel.Value.Id != channel.Id)
+            if (currentChannel.Value?.Id != channel.Id)
             {
                 if (!channel.Joined.Value)
                     channel = channelManager.JoinChannel(channel);