diff --git a/code/modules/vehicles/mecha/combat/justice.dm b/code/modules/vehicles/mecha/combat/justice.dm
index e99632394a1..00b0543dbd8 100644
--- a/code/modules/vehicles/mecha/combat/justice.dm
+++ b/code/modules/vehicles/mecha/combat/justice.dm
@@ -170,10 +170,10 @@
 	. = ..()
 	RegisterSignal(chassis, COMSIG_MECH_SAFETIES_TOGGLE, PROC_REF(on_toggle_safety))
 
-/// update button icon when toggle safety.
+/// update button icon when toggle safety and turns invisibility off.
 /datum/action/vehicle/sealed/mecha/invisibility/proc/on_toggle_safety()
 	SIGNAL_HANDLER
-
+	invisibility_off()
 	build_all_button_icons(UPDATE_BUTTON_STATUS)
 
 /datum/action/vehicle/sealed/mecha/invisibility/Trigger(trigger_flags)