diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index bd6d250ee70..75ccf515d22 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -768,7 +768,6 @@
 		emote_type = user_emote_type
 
 	message = our_message
-	message = user.say_emphasis(message) //SKYRAT EDIT ADDITION - EMOTES
 	. = ..()
 
 	///Reset the message and emote type after it's run.
diff --git a/modular_skyrat/modules/container_emotes/code/container_emotes.dm b/modular_skyrat/modules/container_emotes/code/container_emotes.dm
index eb920c7a20e..5021fde1b01 100644
--- a/modular_skyrat/modules/container_emotes/code/container_emotes.dm
+++ b/modular_skyrat/modules/container_emotes/code/container_emotes.dm
@@ -81,7 +81,7 @@
 
 	var/space = should_have_space_before_emote(html_decode(container_emote)[1]) ? " " : ""
 
-	container_message = ("[user.say_emphasis(container_message)]")
+	container_message = ("[user.apply_message_emphasis(container_message)]")
 
 	var/atom/picked_loc
 	if (!length(locs_we_can_use))
diff --git a/modular_skyrat/modules/verbs/code/subtle.dm b/modular_skyrat/modules/verbs/code/subtle.dm
index 1f521db74dd..949d0d6b13a 100644
--- a/modular_skyrat/modules/verbs/code/subtle.dm
+++ b/modular_skyrat/modules/verbs/code/subtle.dm
@@ -41,7 +41,7 @@
 
 	var/space = should_have_space_before_emote(html_decode(subtle_emote)[1]) ? " " : ""
 
-	subtle_message = span_subtle("<b>[user]</b>[space]<i>[user.say_emphasis(subtle_message)]</i>")
+	subtle_message = span_subtle("<b>[user]</b>[space]<i>[user.apply_message_emphasis(subtle_message)]</i>")
 
 	var/list/viewers = get_hearers_in_view(SUBTLE_ONE_TILE, user)
 
@@ -137,7 +137,7 @@
 
 	var/space = should_have_space_before_emote(html_decode(subtler_emote)[1]) ? " " : ""
 
-	subtler_message = span_subtler("<b>[user]</b>[space]<i>[user.say_emphasis(subtler_message)]</i>")
+	subtler_message = span_subtler("<b>[user]</b>[space]<i>[user.apply_message_emphasis(subtler_message)]</i>")
 
 	if(istype(target, /mob))
 		var/mob/target_mob = target