diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index f6d5eb2e8cb..13979dafa5f 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -499,7 +499,8 @@
 		T2 = T
 		if(locate(/obj/machinery/shieldwall) in T)
 			F = (locate(/obj/machinery/shieldwall) in T)
-			qdel(F)
+			if(F.type == /obj/machinery/shieldwall)
+				qdel(F)
 
 		if(locate(/obj/machinery/shieldwallgen) in T)
 			G = (locate(/obj/machinery/shieldwallgen) in T)