diff --git a/SteamKit2/SteamKit2/Steam3/CMClient.cs b/SteamKit2/SteamKit2/Steam3/CMClient.cs
index b1c713a1..82d90dd1 100644
--- a/SteamKit2/SteamKit2/Steam3/CMClient.cs
+++ b/SteamKit2/SteamKit2/Steam3/CMClient.cs
@@ -158,15 +158,16 @@ namespace SteamKit2.Internal
 
                 // post disconnection callback
                 OnClientDisconnected();
+                return;
             }
 
             if ( !bEncrypted )
             {
-                // since there is no encryption handshake, we're 'connected' after the underlying connection is established
-                OnClientConnected();
-
                 // we only connect to the public universe
                 ConnectedUniverse = EUniverse.Public;
+
+                // since there is no encryption handshake, we're 'connected' after the underlying connection is established
+                OnClientConnected();
             }
         }
         /// <summary>