diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
index a2d32e0d4f..abca9db109 100644
--- a/code/game/machinery/computer/_computer.dm
+++ b/code/game/machinery/computer/_computer.dm
@@ -17,12 +17,8 @@
 
 /obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C)
 	. = ..()
-
 	power_change()
 
-/obj/machinery/computer/Destroy()
-	. = ..()
-
 /obj/machinery/computer/process()
 	if(stat & (NOPOWER|BROKEN))
 		return FALSE
@@ -119,6 +115,9 @@
 			A.circuit = circuit
 			// Circuit removal code is handled in /obj/machinery/Exited()
 			circuit.forceMove(A)
+			// no it's not 4head the circuit's in nullspace which means this won't be called!!
+			circuit = null
+			component_parts -= circuit
 			A.set_anchored(TRUE)
 			if(stat & BROKEN)
 				if(user)
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 47343ea58f..c18d146e90 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -151,6 +151,7 @@
 
 					new_computer.RefreshParts()
 					new_computer.on_construction()
+					new_computer.circuit.moveToNullspace()
 
 				qdel(src)
 				return