diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 13979dafa5f..30567b14371 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -499,7 +499,7 @@
 		T2 = T
 		if(locate(/obj/machinery/shieldwall) in T)
 			F = (locate(/obj/machinery/shieldwall) in T)
-			if(F.type == /obj/machinery/shieldwall)
+			if(F.gen_primary == src || F.gen_secondary == src)
 				qdel(F)
 
 		if(locate(/obj/machinery/shieldwallgen) in T)