diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index fab8dff2..fe3456f2 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -64,7 +64,7 @@
 		if(!M.client || isnewplayer(M))
 			continue
 		var/T = get_turf(user)
-		if(M.stat == DEAD && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T, null)))
+		if(M.stat == DEAD && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T, null)) && (user.client)) //SKYRAT CHANGE - only user controlled mobs show their emotes to all-seeing ghosts, to reduce chat spam
 			M.show_message(msg)
 
 	if(emote_type == EMOTE_AUDIBLE)