diff --git a/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc
index 9d4c0c5..9a958a0 100644
--- a/userraw/maps/mp/bots/_bot_internal.gsc
+++ b/userraw/maps/mp/bots/_bot_internal.gsc
@@ -463,9 +463,6 @@ grenade_danager()
 		if(self isDefusing() || self isPlanting())
 			continue;
 
-		if (self.disabledWeapon)
-			continue;
-
 		myEye = self getEye();
 		for (i = level.bots_fragList.count-1; i >= 0; i--)
 		{
diff --git a/userraw/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc
index 3ab3bd9..23a41a4 100644
--- a/userraw/maps/mp/bots/_bot_script.gsc
+++ b/userraw/maps/mp/bots/_bot_script.gsc
@@ -1626,6 +1626,7 @@ bot_use_bomb(bomb)
 	myteam = self.team;
 	
 	self BotStopMoving(true);
+	self _disableOffhandWeapons();
 	
 	bomb [[bomb.onBeginUse]](self);
 	
@@ -1641,6 +1642,7 @@ bot_use_bomb(bomb)
 	{
 		self.claimTrigger = undefined;
 		self BotStopMoving(false);
+		self _enableOffhandWeapons();
 	}
 
 	bomb [[bomb.onEndUse]](myteam, self, (result == "bot_try_use_success"));
@@ -2129,9 +2131,6 @@ bot_use_tube_think()
 		if(self isDefusing() || self isPlanting())
 			continue;
 
-		if (self.disabledWeapon)
-			continue;
-
 		if (self IsUsingRemote())
 			continue;