diff --git a/dlls/client.cpp b/dlls/client.cpp
index 7c8ef010..cf1ec97a 100644
--- a/dlls/client.cpp
+++ b/dlls/client.cpp
@@ -479,6 +479,10 @@ void ClientUserInfoChanged( edict_t *pEntity, char *infobuffer )
 	if ( !pEntity->pvPrivateData )
 		return;
 
+	CBasePlayer *pPlayer = GetClassPtr((CBasePlayer *)&pEntity->v);
+	if (!pPlayer->IsConnected())
+		return;
+
 	// msg everyone if someone changes their name,  and it isn't the first time (changing no name to current name)
 	if ( pEntity->v.netname && STRING(pEntity->v.netname)[0] != 0 && !FStrEq( STRING(pEntity->v.netname), g_engfuncs.pfnInfoKeyValue( infobuffer, "name" )) )
 	{