diff --git a/game/neo/resource/neo_ui/Neo_ClassMenu.res b/game/neo/resource/neo_ui/Neo_ClassMenu.res
index ebeff3d90..5d7c9e3ac 100644
--- a/game/neo/resource/neo_ui/Neo_ClassMenu.res
+++ b/game/neo/resource/neo_ui/Neo_ClassMenu.res
@@ -126,7 +126,7 @@
 		"tall"			"16"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"tabPosition"	"1"
 		"labelText"		"0"
@@ -168,7 +168,7 @@
 		"tall"			"16"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"tabPosition"	"1"
 		"labelText"		"0"
@@ -209,7 +209,7 @@
 		"tall"			"16"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"tabPosition"	"1"
 		"labelText"		"0"
diff --git a/src/game/client/neo/game_controls/neo_classmenu.cpp b/src/game/client/neo/game_controls/neo_classmenu.cpp
index fb68bcf42..8ca65ee19 100644
--- a/src/game/client/neo/game_controls/neo_classmenu.cpp
+++ b/src/game/client/neo/game_controls/neo_classmenu.cpp
@@ -501,7 +501,12 @@ void CNeoClassMenu::OnThink()
 				V_sprintf_safe(textBuff, "%d", numClassPlayers);
 				pClassButton->SetEnabled(true);
 			}
-			pClassLabel->SetText(textBuff);
+
+			if (NEORules()->IsTeamplay())
+			{
+				pClassLabel->SetVisible(true);
+				pClassLabel->SetText(textBuff);
+			}
 
 			if (pLocalPlayer->GetClass() == neoClass)
 			{