diff --git a/ts/components/emoji/lib.ts b/ts/components/emoji/lib.ts
index c16d841fb..a87190e48 100644
--- a/ts/components/emoji/lib.ts
+++ b/ts/components/emoji/lib.ts
@@ -202,7 +202,7 @@ export function replaceColons(str: string) {
       .split(':')
       .filter(Boolean);
 
-    if (shortName) {
+    if (shortName && isShortName(shortName)) {
       return convertShortName(shortName, parseInt(skinTone, 10));
     }