diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index feba4fc1626..6a0a1d5bfa7 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -1,12 +1,11 @@
 /datum/event/disease_outbreak
-	announceWhen = 15
+	announceWhen = 180
 	/// The type of disease that patient zero will be infected with.
 	var/datum/disease/D
 	/// The initial target of the disease.
 	var/mob/living/carbon/human/patient_zero
 
 /datum/event/disease_outbreak/setup()
-	announceWhen = rand(15, 30)
 	if(prob(25))
 		var/virus_type = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis, /datum/disease/beesease, /datum/disease/anxiety, /datum/disease/fake_gbs, /datum/disease/fluspanish, /datum/disease/pierrot_throat, /datum/disease/lycan)
 		D = new virus_type()
@@ -21,9 +20,6 @@
 
 /datum/event/disease_outbreak/announce()
 	GLOB.event_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak7.ogg')
-	for(var/p in GLOB.dead_mob_list)
-		var/mob/M = p
-		to_chat(M, "<span class='deadsay'><b>[patient_zero]</b> has been infected with <b>[D.name]</b> ([ghost_follow_link(patient_zero, M)])</span>")
 
 /datum/event/disease_outbreak/start()
 	for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list))
@@ -40,4 +36,6 @@
 		if(!H.ForceContractDisease(D))
 			continue
 		patient_zero = H
+		for(var/mob/M as anything in GLOB.dead_mob_list) //Announce patient zero to dchat
+			to_chat(M, "<span class='deadsay'><b>[patient_zero]</b> has been infected with <b>[D.name]</b> ([ghost_follow_link(patient_zero, M)])</span>")
 		break