diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index aa80f0e..99f1074 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -2049,6 +2049,10 @@ bot_use_equipment_think()
 
 		loc = undefined;
 
+		curWeap = self GetCurrentWeapon();
+		if (curWeap == "none" || !isWeaponDroppable(curWeap))
+			curWeap = self.lastDroppableWeapon;
+
 		if (!self nearAnyOfWaypoints(128, level.waypointsClay))
 		{
 			clayWps = [];
@@ -2106,6 +2110,7 @@ bot_use_equipment_think()
 			self notify("stop_firing_weapon");
 		}
 
+		self thread changeToWeapon(curWeap);
 		self ClearScriptAimPos();
 		self BotStopMoving(false);
 	}
@@ -2462,7 +2467,7 @@ bot_killstreak_think()
 			continue;
 
 		curWeap = self GetCurrentWeapon();
-		if (curWeap == "none")
+		if (curWeap == "none" || !isWeaponDroppable(curWeap))
 			curWeap = self.lastDroppableWeapon;
 			
 		targetPos = undefined;