diff --git a/src/p_pspr.c b/src/p_pspr.c
index 16442880..d5238dcf 100644
--- a/src/p_pspr.c
+++ b/src/p_pspr.c
@@ -586,7 +586,10 @@ void A_Lower(player_t *player, pspdef_t *psp)
       return;
     }
 
-  player->readyweapon = player->pendingweapon;
+  if (player->pendingweapon < NUMWEAPONS || !mbf21)
+  {
+    player->readyweapon = player->pendingweapon;
+  }
 
   P_BringUpWeapon(player);
 }