diff --git a/ClientCore/CnCNet5/GameCollection.cs b/ClientCore/CnCNet5/GameCollection.cs
index 9ecf12aef..e48c5d52c 100644
--- a/ClientCore/CnCNet5/GameCollection.cs
+++ b/ClientCore/CnCNet5/GameCollection.cs
@@ -197,7 +197,8 @@ public void Initialize()
             };
 
             // CnCNet chat.
-            CnCNetGame[] otherGames =
+            CnCNetGame[] otherGames = [];
+            /*
             {
                 new()
                 {
@@ -208,6 +209,7 @@ public void Initialize()
                     Texture = AssetLoader.TextureFromImage(cncnetIcon)
                 }
             };
+            */
 
             GameList.AddRange(defaultGames);
             GameList.AddRange(GetCustomGames(defaultGames.Concat(otherGames).ToList()));
diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs
index 78ea9888e..01acd8178 100644
--- a/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs
+++ b/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetLobby.cs
@@ -1190,7 +1190,8 @@ private void ConnectionManager_WelcomeMessageReceived(object sender, EventArgs e
             tbChatInput.Enabled = true;
 
             Channel cncnetChannel = connectionManager.FindChannel("#cncnet");
-            cncnetChannel.Join();
+            if (cncnetChannel != null)
+                cncnetChannel.Join();
 
             string localGameChatChannelName = gameCollection.GetGameChatChannelNameFromIdentifier(localGameID);
             connectionManager.FindChannel(localGameChatChannelName).Join();