diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm
index 8703241cb0b..2e1390f033d 100644
--- a/code/modules/power/apc/apc.dm
+++ b/code/modules/power/apc/apc.dm
@@ -165,7 +165,9 @@
 	if(terminal)
 		disconnect_terminal()
 	machine_powernet.powernet_apc = null
-	apc_area.apc -= src
+	if(apc_area)
+		apc_area.apc = null
+		apc_area = null
 	return ..()