diff --git a/src/game/iw4/mp_tu6/components/sv_bots.cpp b/src/game/iw4/mp_tu6/components/sv_bots.cpp
index 1fe8ba0..8681eb9 100644
--- a/src/game/iw4/mp_tu6/components/sv_bots.cpp
+++ b/src/game/iw4/mp_tu6/components/sv_bots.cpp
@@ -280,6 +280,14 @@ static void PlayerCmd_BotStop(scr_entref_t entref)
     g_botai[entref.entnum].has_remote_angles = false;
     g_botai[entref.entnum].melee_charge_yaw = 0.0f;
     g_botai[entref.entnum].melee_charge_dist = 0;
+
+    const gclient_s *client = &level->clients[entref.entnum];
+    g_botai[entref.entnum].angles[IW4_PITCH] = client->ps.viewangles[IW4_PITCH];
+    g_botai[entref.entnum].angles[IW4_YAW] = client->ps.viewangles[IW4_YAW];
+    g_botai[entref.entnum].angles[IW4_ROLL] = client->ps.viewangles[IW4_ROLL];
+    g_botai[entref.entnum].weapon = static_cast<unsigned short>(client->ps.weapCommon.weapon);
+    g_botai[entref.entnum].primaryWeaponForAlt =
+        static_cast<unsigned short>(client->ps.weapCommon.primaryWeaponForAltMode);
 }
 
 static void PlayerCmd_BotMovement(scr_entref_t entref)