diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 71bfc52cfe4..ecfbb77e79a 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -67,7 +67,10 @@
 	kill_program(forced = TRUE)
 	STOP_PROCESSING(SSobj, src)
 	for(var/H in all_components)
-		qdel(H)
+		var/obj/item/weapon/computer_hardware/CH = H
+		if(CH.holder == src)
+			CH.holder = null
+			qdel(CH)
 	return ..()
 
 // Eject ID card from computer, if it has ID slot with card inside.