diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index 176d42505..5ebae2c58 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -4523,7 +4523,8 @@ DETONATEB:
                         if( ps[p].gotweapon[HANDBOMB_WEAPON] == 0 || s->owner == ps[p].i )
                         {
                             /* addweapon(&ps[p],HANDBOMB_WEAPON); */
-                            if (!(ps[p].weaponswitch & 1)) addweaponnoswitch(&ps[p],HANDBOMB_WEAPON);
+                            if (!(ps[p].weaponswitch & 1) && *aplWeaponWorksLike[ps[p].curr_weapon] != HANDREMOTE_WEAPON)
+                                addweaponnoswitch(&ps[p],HANDBOMB_WEAPON);
                             else addweapon( &ps[p],HANDBOMB_WEAPON);
                         }