diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
index 0c4c6c4bbe..11a309ad44 100644
--- a/code/game/machinery/computer/_computer.dm
+++ b/code/game/machinery/computer/_computer.dm
@@ -19,6 +19,10 @@
 /obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C)
 	. = ..()
 	power_change()
+	if(!QDELETED(C))
+		qdel(circuit)
+		circuit = C
+		C.forceMove(src)
 
 /obj/machinery/computer/Destroy()
 	QDEL_NULL(circuit)