diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm
index 565919c07ec..2fec22edbc6 100644
--- a/code/modules/mod/modules/_module.dm
+++ b/code/modules/mod/modules/_module.dm
@@ -330,6 +330,7 @@
 	SIGNAL_HANDLER
 
 	if(source == device)
+		device.moveToNullspace()
 		device = null
 		qdel(src)