diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 9b4c459264b..4b6e4e17539 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -31,13 +31,13 @@ mob/proc/custom_emote(var/m_type=1,var/message = null)
 			if (istype(M, /mob/new_player))
 				continue
 			if(findtext(message," snores.")) //Because we have so many sleeping people.
-				break // can break here simply..
+				break
 			if(M.stat == 2 && M.client.ghost_sight && !(M in viewers(src,null)))
 				M.show_message(message)
 
 
 		if (m_type & 1)
-			for (var/mob/O in get_mobs_in_view(world.view,src))
+			for (var/mob/O in viewers(src, null))
 				if(istype(O,/mob/living/carbon/human))
 					for(var/mob/living/parasite/P in O:parasites)
 						P.show_message(message, m_type)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index f0407f0ec3f..6dff94c60c3 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -482,9 +482,9 @@
 
 
 		if (m_type & 1)
-			for (var/mob/O in viewers(src, null))
+			for (var/mob/O in get_mobs_in_view(world.view,src))
 				O.show_message(message, m_type)
 		else if (m_type & 2)
-			for (var/mob/O in hearers(src.loc, null))
+			for (var/mob/O in (hearers(src.loc, null) | get_mobs_in_view(world.view,src)))
 				O.show_message(message, m_type)