diff --git a/src/client/cmds.qc b/src/client/cmds.qc
index 6471168..19fd01c 100644
--- a/src/client/cmds.qc
+++ b/src/client/cmds.qc
@@ -19,7 +19,8 @@ ClientGame_ConsoleCommand(void)
 {
 	switch(argv(0)) {
 	case "chooseteam":
-		Textmenu_Toggle("TEAM_SELECT");
+		if (serverkeyfloat("sv_playerslots") > 1)
+			Textmenu_Toggle("TEAM_SELECT");
 		break;
 	case "buy":
 		Textmenu_Toggle("BUY");
diff --git a/src/client/init.qc b/src/client/init.qc
index 8c94b97..cce7e06 100644
--- a/src/client/init.qc
+++ b/src/client/init.qc
@@ -115,7 +115,7 @@ ClientGame_Init(float apilevel, string enginename, float engineversion)
 void
 ClientGame_InitDone(void)
 {
-	if (getplayerkeyfloat(player_localnum, "*spec") == 2)
+	if (serverkeyfloat("sv_playerslots") > 1)
 		Textmenu_Call("TEAM_SELECT");
 }