diff --git a/raw/maps/mp/bots/_bot_script.gsc b/raw/maps/mp/bots/_bot_script.gsc
index e3d0167..6c1e36a 100644
--- a/raw/maps/mp/bots/_bot_script.gsc
+++ b/raw/maps/mp/bots/_bot_script.gsc
@@ -1539,12 +1539,15 @@ onDeath()
 {
 	self endon("disconnect");
 
+	self thread onGiveLoadout();
 	for(;;)
 	{
 		self waittill("death");
 
 		self.wantSafeSpawn = true;
 		self ClearScriptGoal();
+
+		self thread onGiveLoadout();
 	}
 }
 
@@ -1554,13 +1557,11 @@ onDeath()
 onGiveLoadout()
 {
 	self endon("disconnect");
+	self endon("death");
 
-	for(;;)
-	{
-		self waittill("giveLoadout");
+	self waittill("giveLoadout");
 
-		self botGiveLoadout(self.team, self.class, false, true);
-	}
+	self botGiveLoadout(self.team, self.class, false, true);
 }
 
 /*
@@ -1582,6 +1583,9 @@ onSpawned()
 		self.bot_was_follow_script_update = undefined;
 		self.bot_stuck_on_carepackage = undefined;
 
+		// prevent bot changing class after spawning
+		self.hasDoneCombat = true;
+
 		if (getDvarInt("bots_play_obj"))
 			self thread bot_dom_cap_think();
 	}