diff --git a/front/src/components/Content/Message.vue b/front/src/components/Content/Message.vue
index 167f3b8..376b7b2 100644
--- a/front/src/components/Content/Message.vue
+++ b/front/src/components/Content/Message.vue
@@ -39,6 +39,7 @@ export default {
       return "```json\n" + JSON.stringify(this.message, null, 2) + "\n```";
     },
     content() {
+      if(!this.message.content) return "";
       let c = this.message.content.replace("\n", "<br/>");
       // create absolute url on images and relative links
       let url = process.env.VUE_APP_ZULIP_site;
@@ -52,6 +53,8 @@ export default {
         "https://chatty-pub-files.hackersanddesigners.nl/files/"
       );
 
+      c = this.replaceAllEmojiCodes(c);
+
       const referrers = this.$store.state.topics
         .find((t) => t.title == this.message.subject)
         .messages.filter(