diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index 9f2753dfee..d82e691622 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -38,6 +38,8 @@
 	if(findtext(msg, "%s"))
 		msg = replacetext(msg, "%s", user.p_s())
 
+	msg = replace_pronoun(user, msg)
+
 	var/mob/living/L = user
 	for(var/obj/item/weapon/implant/I in L.implants)
 		I.trigger(key, L)
@@ -61,6 +63,15 @@
 		user.visible_message(msg)
 	log_emote("[key_name(user)] : [msg]")
 
+/datum/emote/proc/replace_pronoun(mob/user, message)
+	if(findtext(message, "their"))
+		message = replacetext(message, "their", user.p_their())
+	if(findtext(message, "them"))
+		message = replacetext(message, "them", user.p_them())
+	if(findtext(message, "%s"))
+		message = replacetext(message, "%s", user.p_s())
+	return message
+
 /datum/emote/proc/select_message_type(mob/user)
 	. = message
 	if(!muzzle_ignore && user.is_muzzled() && emote_type == EMOTE_AUDIBLE)
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index cacd433fec..a0aa88779b 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -420,6 +420,9 @@
 	message = null
 	emote_type = EMOTE_VISIBLE
 
+/datum/emote/living/custom/replace_pronoun(mob/user, message)
+	return message
+
 /datum/emote/living/help
 	key = "help"