diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm
index e0bb07369b6..df9a3cbef9e 100644
--- a/code/WorkInProgress/Mini/atmos_control.dm
+++ b/code/WorkInProgress/Mini/atmos_control.dm
@@ -54,7 +54,7 @@
 	var/list/data[0]
 	data["alarm"]=null
 	if(current)
-		data += current.get_nano_data(user,TRUE)
+		data += current.get_nano_data(user,1,emagged)
 		data["alarm"] = "\ref[current]"
 
 	var/list/alarms=list()
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 75b33bf83fe..b30205339de 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -615,7 +615,7 @@
 	data["danger"]=danger
 	return data
 
-/obj/machinery/alarm/proc/get_nano_data(mob/user, fromAtmosConsole=0)
+/obj/machinery/alarm/proc/get_nano_data(mob/user, fromAtmosConsole=0, AtmosConsoleEmagged=0)
 
 	var/data[0]
 	data["air"]=ui_air_status()
@@ -626,7 +626,7 @@
 	//   Not sent from atmos console AND
 	//   Not silicon AND locked.
 	data["locked"]=!fromAtmosConsole && (!(istype(user, /mob/living/silicon)) && locked)
-	if(fromAtmosConsole && remote_control < 2)
+	if(fromAtmosConsole && (remote_control < 2 && !AtmosConsoleEmagged))
 		data["locked"] = 1
 	data["rcon"]=rcon_setting
 	data["target_temp"] = target_temperature - T0C