diff --git a/tier1/convar.cpp b/tier1/convar.cpp
index 5290f124..52bda5a8 100644
--- a/tier1/convar.cpp
+++ b/tier1/convar.cpp
@@ -52,12 +52,14 @@ public:
 	{
 		if ( s_bConCommandsRegistered )
 		{
-			g_pCVar->RegisterConCommand( pCmd, s_nCVarFlag );
-			if ( !pCmd->GetRef()->handle.IsValid() )
+			ConCommandHandle hndl = g_pCVar->RegisterConCommand( pCmd, s_nCVarFlag );
+			if ( !hndl.IsValid() )
 			{
 				Plat_FatalErrorFunc( "RegisterConCommand: Unknown error registering con command \"%s\"!\n", pCmd->GetName() );
 				DebuggerBreakIfDebugging();
 			}
+
+			pCmd->SetHandle( hndl );
 		}
 		else
 		{