diff --git a/src/client/filters/RemoveHashtags.js b/src/client/filters/RemoveHashtags.js
index 67b7f08d..cc273eac 100644
--- a/src/client/filters/RemoveHashtags.js
+++ b/src/client/filters/RemoveHashtags.js
@@ -1,5 +1,5 @@
 export default function(app) {
     app.filter('removeHashtags', () => {
-        return string => string.replace(/(#[^\s]+)/g, '');
+        return string => string ? string.replace(/(#[^\s]+)/g, '') : string;
     });
 };