diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 9a2d1e7d..eb195bc1 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -58,8 +58,8 @@ const ChatMessage = {
       return {
         summary: '',
         emojis: this.message.emojis,
-        raw_html: this.message.content,
-        text: this.message.content,
+        raw_html: this.message.content || '',
+        text: this.message.content || '',
         attachments: this.message.attachments
       }
     },