diff --git a/raw/maps/mp/bots/_bot_script.gsc b/raw/maps/mp/bots/_bot_script.gsc
index 8386a97..6a155df 100644
--- a/raw/maps/mp/bots/_bot_script.gsc
+++ b/raw/maps/mp/bots/_bot_script.gsc
@@ -1166,7 +1166,7 @@ classWatch()
 
 	for(;;)
 	{
-		while(!isdefined(self.pers["team"]))
+		while(!isdefined(self.pers["team"]) || !allowClassChoice())
 			wait .05;
 			
 		wait 0.5;
@@ -1230,7 +1230,7 @@ teamWatch()
 
 	for(;;)
 	{
-		while(!isdefined(self.pers["team"]))
+		while(!isdefined(self.pers["team"]) || !allowTeamChoice())
 			wait .05;
 			
 		wait 0.05;