diff --git a/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc b/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc
index 8b4e61da..7d26044f 100644
--- a/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc
+++ b/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc
@@ -43,7 +43,11 @@ one_inch_punch_melee_attack()
 	self giveweapon( punch_weapon );
 	self set_player_melee_weapon( punch_weapon );
 	self giveweapon( "held_" + punch_weapon );
-	self setactionslot( 2, "weapon", "held_" + punch_weapon );
+
+	if (!self hasweapon("equip_dieseldrone_zm"))
+	{
+		self setactionslot(2, "weapon", "held_" + punch_weapon);
+	}
 
 	if (result != "player_downed")
 	{
diff --git a/scripts/zm/replaced/zm_tomb_craftables.gsc b/scripts/zm/replaced/zm_tomb_craftables.gsc
index bca4d965..488b6504 100644
--- a/scripts/zm/replaced/zm_tomb_craftables.gsc
+++ b/scripts/zm/replaced/zm_tomb_craftables.gsc
@@ -238,7 +238,7 @@ quadrotor_control_thread()
 			if (self hasweapon("equip_dieseldrone_zm"))
 			{
 				self takeweapon("equip_dieseldrone_zm");
-				self setactionslot(2, "");
+				self setactionslot(2, "weapon", "held_" + self get_player_melee_weapon());
 			}
 
 			str_vehicle = "heli_quadrotor_zm";