diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm
index d6cfb4e333e..6a03a991388 100644
--- a/code/modules/power/apc/apc.dm
+++ b/code/modules/power/apc/apc.dm
@@ -159,7 +159,7 @@
 		set_pixel_offsets_from_dir(24, -24, 24, -24)
 
 		apc_area = get_area(src)
-		apc_area.apc |= src
+		apc_area.apc += src
 		opened = APC_OPENED
 		operating = FALSE
 		name = "[apc_area.name] APC"
@@ -174,7 +174,7 @@
 
 	machine_powernet.set_power_channel(PW_CHANNEL_LIGHTING, FALSE)
 	machine_powernet.set_power_channel(PW_CHANNEL_EQUIPMENT, FALSE)
-	machine_powernet.set_power_channel(PW_CHANNEL_LIGHTING, FALSE)
+	machine_powernet.set_power_channel(PW_CHANNEL_ENVIRONMENT, FALSE)
 	machine_powernet.power_change()
 	if(occupier)
 		malfvacate(1)
@@ -183,6 +183,7 @@
 	if(terminal)
 		disconnect_terminal()
 	machine_powernet.powernet_apc = null
+	apc_area.apc -= src
 	return ..()