diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 891bbf330a0..af50934e94b 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -98,7 +98,10 @@
 		if(!msg)
 			return
 
-	msg = emoji_parse(msg)
+	var/rawmsg = msg
+	if(holder)
+		msg = emoji_parse(msg)
+
 	var/keywordparsedmsg = keywords_lookup(msg)
 
 	if(C.holder)
@@ -141,7 +144,7 @@
 			src << "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>"
 			return
 
-	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
+	log_admin("PM: [key_name(src)]->[key_name(C)]: [rawmsg]")
 
 	//we don't use message_admins here because the sender/receiver might get it too
 	for(var/client/X in admins)
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index aab9947c89e..a3046e2950b 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -18,7 +18,7 @@ var/list/emojis
 			if(search)
 				emoji = lowertext(copytext(text, pos+1, search))
 				if(emoji in emojis)
-					parsed += "<img class=icon src=\ref['icons/emoji.dmi'] iconstate='[emoji]'>"
+					parsed += " <img class=icon src=\ref['icons/emoji.dmi'] iconstate='[emoji]'>"
 					pos = search + 1
 				else
 					parsed += copytext(text, pos, search)