diff --git a/app/javascript/shared/helpers/emoji.js b/app/javascript/shared/helpers/emoji.js
index 371472623..5323a14ce 100644
--- a/app/javascript/shared/helpers/emoji.js
+++ b/app/javascript/shared/helpers/emoji.js
@@ -34,11 +34,14 @@ export const hasEmojiSupport = () => {
 };
 
 export const removeEmoji = text => {
-  return text
-    .replace(
-      /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g,
-      ''
-    )
-    .replace(/\s+/g, ' ')
-    .trim();
+  if (text) {
+    return text
+      .replace(
+        /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g,
+        ''
+      )
+      .replace(/\s+/g, ' ')
+      .trim();
+  }
+  return '';
 };