diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index c2855b4a46..8cdec2f324 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -208,8 +208,6 @@
 						new_machine.component_parts = list()
 
 						circuit.forceMove(new_machine)
-						// TODO: make sleepers not shit out parts PROPERLY THIS TIME.
-						new_machine.circuit.moveToNullspace()
 						new_machine.component_parts += circuit
 						new_machine.circuit = circuit
 
@@ -219,6 +217,8 @@
 						new_machine.RefreshParts()
 
 						new_machine.on_construction()
+						// TODO: make sleepers not shit out parts PROPERLY THIS TIME.
+						new_machine.circuit.moveToNullspace()
 					qdel(src)
 				return