diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index bb8bb195b..5d373d031 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -4413,7 +4413,7 @@ HORIZONLY:
     if(p->show_empty_weapon > 0)
     {
         p->show_empty_weapon--;
-        if(p->show_empty_weapon == 0 && (p->weaponswitch & 2))
+        if(p->show_empty_weapon == 0 && (p->weaponswitch & 2) && p->ammo_amount[p->curr_weapon] <= 0)
         {
             if(p->last_full_weapon == GROW_WEAPON)
                 p->subweapon |= (1<<GROW_WEAPON);