diff --git a/src/game/bondgun.c b/src/game/bondgun.c
index e2920d53f..f342ffbb5 100644
--- a/src/game/bondgun.c
+++ b/src/game/bondgun.c
@@ -5757,14 +5757,20 @@ bool bgunHasAmmoForWeapon(s32 weaponnum)
 
 u8 g_AutoSwitchWeaponsPrimary[] = {
 	WEAPON_RCP120,
+	WEAPON_RCP45,
 	WEAPON_SUPERDRAGON, // primary function
 	WEAPON_K7AVENGER,
 	WEAPON_AR34,
+	WEAPON_AR53,
+	WEAPON_KF7SPECIAL,
 	WEAPON_CALLISTO,
 	WEAPON_LAPTOPGUN,
 	WEAPON_DRAGON,
 	WEAPON_CMP150,
 	WEAPON_CYCLONE,
+	WEAPON_ZZT,
+	WEAPON_DMC,
+	WEAPON_KL01313,
 	WEAPON_FARSIGHT,
 	WEAPON_SHOTGUN,
 	WEAPON_REAPER,
@@ -5776,6 +5782,8 @@ u8 g_AutoSwitchWeaponsPrimary[] = {
 	WEAPON_FALCON2_SCOPE,
 	WEAPON_FALCON2,
 	WEAPON_FALCON2_SILENCER,
+	WEAPON_PP9I,
+	WEAPON_CC13,
 	WEAPON_SNIPERRIFLE,
 	WEAPON_CROSSBOW,
 	WEAPON_TRANQUILIZER,