diff --git a/src/g_game.c b/src/g_game.c
index e5ebcbb2..943b66df 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -460,7 +460,8 @@ void G_BuildTiccmd(ticcmd_t* cmd)
 
   if ((!demo_compatibility && players[consoleplayer].attackdown &&
        !P_CheckAmmo(&players[consoleplayer]) &&
-       ((boom_weapon_state_injection && !done_autoswitch) || cmd->buttons & BT_ATTACK)) ||
+       ((boom_weapon_state_injection && !done_autoswitch) ||
+       (cmd->buttons & BT_ATTACK && players[consoleplayer].pendingweapon == wp_nochange))) ||
        M_InputGameActive(input_weapontoggle))
   {
     done_autoswitch = true;