diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index f44ef9d42..24289c642 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -148,7 +148,9 @@ void addweapon( struct player_struct *p,short weapon)
 
     if(p->holster_weapon == 0)
     {
-        p->weapon_pos = -1;
+        if(p->weapon_pos == 0)
+            p->weapon_pos = -1;
+        else p->weapon_pos = -9;
         p->last_weapon = p->curr_weapon;
     }
     else