diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index d29bbde4080..b4e92e2a91e 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -57,6 +57,7 @@
 	var/list/messageturfs = list()//List of turfs we broadcast to.
 	var/list/messagemobs = list() 
 	var/list/ghosts = list()
+	var/list/ghosts_nearby = list()
 
 	var/hearing_aid = FALSE
 	if(type == 2 && ishuman(src))
@@ -71,7 +72,7 @@
 			continue
 		if(get_turf(M) in messageturfs)
 			if (isobserver(M))
-				ghosts += M
+				ghosts_nearby += M
 				continue
 			else if (isliving(M) && !(type == 2 && ((sdisabilities & DEAF) && !hearing_aid) || ear_deaf > 1))
 				messagemobs += M
@@ -83,7 +84,8 @@
 	for (var/mob/N in messagemobs)
 		N.show_message(message, type)
 
-	message = "<B>[message]</B>"
-
 	for(var/mob/O in ghosts)
 		O.show_message("[ghost_follow_link(src, O)] [message]", type)
+	
+	for(var/mob/GN in ghosts_nearby)
+		GN.show_message("[ghost_follow_link(src, GN)] <b>[message]</b>", type)
diff --git a/html/changelogs/mattatlas-emotemoment.yml b/html/changelogs/mattatlas-emotemoment.yml
new file mode 100644
index 00000000000..1dbb2034a15
--- /dev/null
+++ b/html/changelogs/mattatlas-emotemoment.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Ghosts now only see bolded emotes when they're near the emoter."