diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index 14f3eae689..d4b6199187 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -55,7 +55,7 @@
 		return
 
 	user.log_message(msg, LOG_EMOTE)
-	msg = "<b>[user]</b> " + msg
+	msg = "<span class='emote'><b>[user]</b> [msg]</span>"
 
 	for(var/mob/M in GLOB.dead_mob_list)
 		if(!M.client || isnewplayer(M))
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 3cda258bcf..471bd9939e 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -51,7 +51,7 @@ proc/get_top_level_mob(var/mob/S)
 		return FALSE
 
 	user.log_message(message, LOG_EMOTE)
-	message = "<b>[user]</b> " + "<i>[user.say_emphasis(message)]</i>"
+	message = "<span class='emote'><b>[user]</b> <i>[user.say_emphasis(message)]</i></span>"
 
 	for(var/mob/M in GLOB.dead_mob_list)
 		if(!M.client || isnewplayer(M))
@@ -107,7 +107,7 @@ proc/get_top_level_mob(var/mob/S)
 		return FALSE
 
 	user.log_message(message, LOG_SUBTLER)
-	message = "<b>[user]</b> " + "<i>[user.say_emphasis(message)]</i>"
+	message = "<span class='emote'><b>[user]</b> <i>[user.say_emphasis(message)]</i></span>"
 
 	user.visible_message(message = message, self_message = message, vision_distance = 1, ignored_mobs = GLOB.dead_mob_list, omni = TRUE)