diff --git a/maps/mp/bots/_bot_internal.gsc b/maps/mp/bots/_bot_internal.gsc
index effe60a..ca9f6e4 100644
--- a/maps/mp/bots/_bot_internal.gsc
+++ b/maps/mp/bots/_bot_internal.gsc
@@ -556,6 +556,12 @@ onWeaponChange()
 		{
 			first = false;
 			newWeapon = self getcurrentweapon();
+
+			// hack fix for botstop overridding weapon
+			if ( newWeapon != "none" )
+			{
+				self switchtoweapon( newWeapon );
+			}
 		}
 		else
 		{
@@ -1781,6 +1787,7 @@ aim()
 	for ( ;; )
 	{
 		wait 0.05;
+		waittillframeend;
 		
 		if ( level.inprematchperiod || level.gameended || self.bot.isfrozen || self maps\mp\_flashgrenades::isflashbanged() )
 		{