diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 29ca70e5acc..127acb23565 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -109,7 +109,7 @@
 
 	var/rename_cyborg = 0
 	var/ooc_during_round = 0
-	var/ooc_emojis = 0
+	var/emojis = 0
 
 	//Used for modifying movement speed for mobs.
 	//Unversal modifiers
@@ -301,8 +301,8 @@
 					config.rename_cyborg			= 1
 				if("ooc_during_round")
 					config.ooc_during_round			= 1
-				if("ooc_emojis")
-					config.ooc_emojis				= 1
+				if("emojis")
+					config.emojis					= 1
 				if("run_delay")
 					config.run_speed				= text2num(value)
 				if("walk_delay")
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 441510c7823..20e86957187 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -43,8 +43,7 @@
 		if(prefs.toggles & MEMBER_PUBLIC)
 			keyname = "<font color='[prefs.ooccolor]'><img style='width:9px;height:9px;' class=icon src=\ref['icons/member_content.dmi'] iconstate=blag>[keyname]</font>"
 
-	if(config.ooc_emojis)
-		msg = emoji_parse(msg)
+	msg = emoji_parse(msg)
 
 	for(var/client/C in clients)
 		if(C.prefs.toggles & CHAT_OOC)
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index d1bcd8456b4..39b8899c4b2 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -68,8 +68,7 @@
 		msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
 		if(!msg)	return
 
-	if(config.ooc_emojis)
-		msg = emoji_parse(msg)
+	msg = emoji_parse(msg)
 
 	if(C.holder)
 		if(holder)	//both are admins
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index a804893bdaf..aab9947c89e 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -1,6 +1,8 @@
 var/list/emojis
 
 /proc/emoji_parse(text)
+	if(!config.emojis)
+		return text
 	if(!emojis)
 		emojis = icon_states(icon('icons/emoji.dmi'))
 	var/parsed = ""
diff --git a/config/game_options.txt b/config/game_options.txt
index fe8ec13eed0..00fad47a4de 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -27,9 +27,9 @@ REVIVAL_BRAIN_LIFE -1
 #Comment this out if you want OOC to be automatically disabled during the round, it will be enabled during the lobby and after the round end results.
 OOC_DURING_ROUND
 
-### OOC EMOJI ###
-#Comment this out if you want to disable OOC emojis
-OOC_EMOJIS
+### EMOJI ###
+#Comment this out if you want to disable emojis
+EMOJIS
 
 ### MOB MOVEMENT ###