diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 4b5e077d9ff..46ed68bf5b6 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -510,13 +510,15 @@
 
 				var/count_eggs = 0
 				var/count_spiderlings = 0
+				var/count_infected = 0
 				for(var/obj/structure/spider/eggcluster/terror_eggcluster/E in GLOB.ts_egg_list)
 					if(is_station_level(E.z))
 						count_eggs += E.spiderling_number
 				for(var/obj/structure/spider/spiderling/terror_spiderling/L in GLOB.ts_spiderling_list)
 					if(!L.stillborn && is_station_level(L.z))
 						count_spiderlings += 1
-				dat += "<table cellspacing=5><TR><TD>Growing TS on-station: [count_eggs] egg[count_eggs != 1 ? "s" : ""], [count_spiderlings] spiderling[count_spiderlings != 1 ? "s" : ""]. </TD></TR></TABLE>"
+				count_infected = length(GLOB.ts_infected_list)
+				dat += "<table cellspacing=5><tr><td>Growing TS on-station: [count_eggs] egg\s, [count_spiderlings] spiderling\s, [count_infected] infected</td></tr></table>"
 
 		if(SSticker.mode.ert.len)
 			dat += check_role_table("ERT", SSticker.mode.ert)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
index a3342163d84..e2c4bdbf0fa 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
@@ -7,6 +7,7 @@ GLOBAL_VAR_INIT(ts_death_window, 9000) // 15 minutes
 GLOBAL_LIST_EMPTY(ts_spiderlist)
 GLOBAL_LIST_EMPTY(ts_egg_list)
 GLOBAL_LIST_EMPTY(ts_spiderling_list)
+GLOBAL_LIST_EMPTY(ts_infected_list)
 
 // --------------------------------------------------------------------------------
 // --------------------- TERROR SPIDERS: DEFAULTS ---------------------------------
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
index 5b2e45466d5..cf848d94928 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
@@ -53,6 +53,26 @@
 		return 1
 	return 0
 
+/obj/item/organ/internal/body_egg/terror_eggs/Initialize(mapload)
+	. = ..()
+	GLOB.ts_infected_list += src
+
+/obj/item/organ/internal/body_egg/terror_eggs/insert(mob/living/carbon/M, special)
+	. = ..()
+	RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(readd_infected))
+
+/obj/item/organ/internal/body_egg/terror_eggs/proc/readd_infected(mob/infected, new_stat, old_stat)
+  SIGNAL_HANDLER
+  if(new_stat != DEAD)
+    GLOB.ts_infected_list |= src
+
+/obj/item/organ/internal/body_egg/terror_eggs/Destroy()
+	GLOB.ts_infected_list -= src
+	return ..()
+
+/obj/item/organ/internal/body_egg/terror_eggs/on_owner_death()
+	GLOB.ts_infected_list -= src
+	return ..()
 
 /obj/structure/spider/terrorweb/white
 	name = "infested web"