diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 73ac274cbac..4b46b9269a4 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -221,19 +221,10 @@
 		recharge_port.stop_charge()
 
 /obj/machinery/computer/mech_bay_power_console/power_change()
-	if(stat & BROKEN)
-		icon_state = initial(icon_state) +"_broken"
+	..()
+	if(stat & (BROKEN|NOPOWER))
 		if(recharge_port)
 			recharge_port.stop_charge()
-	else if(powered())
-		icon_state = initial(icon_state)
-		stat &= ~NOPOWER
-	else
-		spawn(rand(0, 15))
-			icon_state = initial(icon_state)+"_nopower"
-			stat |= NOPOWER
-			if(recharge_port)
-				recharge_port.stop_charge()
 
 /obj/machinery/computer/mech_bay_power_console/set_broken()
 	icon_state = initial(icon_state)+"_broken"