diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
index 2ef07f0eac4..c93ae5cafc0 100644
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -45,9 +45,6 @@ var/global/list/minor_air_alarms = list()
 		ui.set_auto_update(1)
 
 /obj/machinery/computer/atmos_alert/update_icon()
-	..()
-	if(stat & (NOPOWER|BROKEN))
-		return
 	var/list/alarms = atmosphere_alarm.major_alarms()
 	if(alarms.len)
 		icon_screen = "alert:2"
@@ -57,7 +54,7 @@ var/global/list/minor_air_alarms = list()
 			icon_screen = "alert:1"
 		else
 			icon_screen = "alert:0"
-	return
+	..()
 
 /obj/machinery/computer/atmos_alert/Topic(href, href_list)
 	if(..())
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index be2e2f85614..8a7d4d170a8 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -64,19 +64,21 @@
 			MK.loc = src.loc
 			// Will help make emagging the console not so easy to get away with.
 			MK.info += "<br><br><font color='red'>£%@%(*$%&(£&?*(%&£/{}</font>"
-			spawn(100*length(src.linkedServer.decryptkey)) UnmagConsole()
+			update_icon()
+			spawn(100*length(src.linkedServer.decryptkey)) 
+				UnmagConsole()
+				update_icon()
 			message = rebootmsg
 		else
 			user << "<span class='notice'>A no server error appears on the screen.</span>"
 
 /obj/machinery/computer/message_monitor/update_icon()
-	..()
-	if(stat & (NOPOWER|BROKEN))
-		return
 	if(emag || hacking)
 		icon_screen = hack_icon
 	else
 		icon_screen = normal_icon
+		
+	..()
 
 /obj/machinery/computer/message_monitor/initialize()
 	..()
diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm
index c16cc38f1d2..19a5d8e59ee 100644
--- a/code/game/machinery/computer/station_alert.dm
+++ b/code/game/machinery/computer/station_alert.dm
@@ -43,14 +43,11 @@
 	alarm_monitor.ui_interact(user)
 
 /obj/machinery/computer/station_alert/update_icon()
-	..()
-	if(stat & (BROKEN|NOPOWER))
-		return
-
 	if(alarm_monitor)
 		var/list/alarms = alarm_monitor.major_alarms()
 		if(alarms.len)
 			icon_screen = "alert:2"
 		else
 			icon_screen = "alert:0"
-		return
+
+	..()
\ No newline at end of file