diff --git a/src/Client.ts b/src/Client.ts
index 1c9a810a..93285a8d 100644
--- a/src/Client.ts
+++ b/src/Client.ts
@@ -420,6 +420,15 @@ export class Client extends AsyncEventEmitter<Events> {
 
         return sub;
       })
+      .replace(RE_CUSTOM_EMOJI, (sub: string, id: string) => {
+        const emoji = this.emojis.get(id as string);
+
+        if (emoji) {
+          return `:${emoji.name}:`;
+        }
+
+        return sub;
+      })
       .replace(RE_SPOILER, "<spoiler>");
   }