diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index ddac0b7cd482..a152e07e3958 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -128,6 +128,7 @@
 		if(chassis.selected == src)
 			chassis.selected = null
 		update_chassis_page()
+		remove_targeted_action()
 		chassis.log_message("[src] removed from equipment.")
 		chassis = null
 		set_ready_state(1)
diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm
index 7121ebcc87b8..26a351c87d6f 100644
--- a/code/game/mecha/mecha_actions.dm
+++ b/code/game/mecha/mecha_actions.dm
@@ -231,8 +231,8 @@
 	equipment = _equipment
 	icon_icon = equipment.icon
 	button_icon_state = equipment.icon_state
-	. = ..()
 	name = "Switch module to [equipment.name]"
+	return ..()
 
 /datum/action/innate/mecha/select_module/Activate()
 	if(!owner || !chassis || chassis.occupant != owner)