diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm
index 62724f6412b..0d9775d0b7d 100644
--- a/code/modules/shieldgen/emergency_shield.dm
+++ b/code/modules/shieldgen/emergency_shield.dm
@@ -178,10 +178,12 @@
 /obj/machinery/shieldgen/proc/create_shields()
 	for(var/T in RANGE_TURFS(2, src))
 		var/turf/target_tile = T
+		if(locate(/obj/machinery/shield) in target_tile)
+			continue
 		var/obj/item/tape/engineering/E = locate() in target_tile
 		if(E?.shield_marker)
 			deploy_shield(target_tile)
-		else if(istype(target_tile,/turf/space) || istype(target_tile,/turf/simulated/open) || istype(target_tile,/turf/unsimulated/floor/asteroid/ash) || istype(target_tile,/turf/simulated/floor/airless) && !(locate(/obj/machinery/shield) in target_tile))
+		else if(istype(target_tile,/turf/space) || istype(target_tile,/turf/simulated/open) || istype(target_tile,/turf/unsimulated/floor/asteroid/ash) || istype(target_tile,/turf/simulated/floor/airless))
 			if(malfunction && prob(33) || !malfunction)
 				deploy_shield(target_tile)
 
diff --git a/html/changelogs/geeves-emergency_shield_fix.yml b/html/changelogs/geeves-emergency_shield_fix.yml
new file mode 100644
index 00000000000..0a6627f827c
--- /dev/null
+++ b/html/changelogs/geeves-emergency_shield_fix.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - bugfix: "Emergency shield generators no longer infinitely stack shields when you use tape."
\ No newline at end of file