diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index 3b82f023..4b91526b 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -7,14 +7,6 @@
 
 	if(!gibbed)
 		emote("deathgasp")
-
-		//watching someone die is trumatic...
-		for(var/mob/living/carbon/human/H in oview(5, src))
-			if(H.client && (src /= H))
-				SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw)
-				if(prob(10)) //10% chance to pump adrenaline into their body
-					H.jitteriness += 5
-
 	if(combatmode)
 		toggle_combat_mode(TRUE, TRUE)
 
@@ -27,6 +19,12 @@
 	if(SSticker.mode)
 		SSticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now
 
+	//watching someone die is traumatic
+	for(var/mob/living/carbon/human/H in oview(5, src))
+		SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "death", /datum/mood_event/deathsaw)
+		if(prob(10)) //10% chance to pump adrenaline into their body
+			H.jitteriness += 5
+
 /mob/living/carbon/gib(no_brain, no_organs, no_bodyparts)
 	var/atom/Tsec = drop_location()
 	for(var/mob/M in src)