diff --git a/server/helpers/markdown.ts b/server/helpers/markdown.ts
index 7c4a1a8b1..2126bb752 100644
--- a/server/helpers/markdown.ts
+++ b/server/helpers/markdown.ts
@@ -9,6 +9,8 @@ markdownIt.enable(TEXT_WITH_HTML_RULES)
 markdownIt.use(markdownItEmoji)
 
 const toSafeHtml = text => {
+  if (!text) return ''
+
   // Restore line feed
   const textWithLineFeed = text.replace(/<br.?\/?>/g, '\r\n')
 
@@ -20,6 +22,8 @@ const toSafeHtml = text => {
 }
 
 const mdToPlainText = text => {
+  if (!text) return ''
+
   // Convert possible markdown (emojis, emphasis and lists) to html
   const html = markdownIt.render(text)