Merge branch 'master' into development

1 files changed, 2 insertions, 2 deletions

diff --git a/app/assets/javascripts/components/actions/notifications.jsx b/app/assets/javascripts/components/actions/notifications.jsx
index a03f88af1..6a8b1b05b 100644
--- a/app/assets/javascripts/components/actions/notifications.jsx
+++ b/app/assets/javascripts/components/actions/notifications.jsx
@@ -76,7 +76,7 @@ export function refreshNotificationsSuccess(notifications, next) {
     type: NOTIFICATIONS_REFRESH_SUCCESS,
     notifications,
     accounts: notifications.map(item => item.account),
-    statuses: notifications.map(item => item.status),
+    statuses: notifications.map(item => item.status).filter(status => !!status),
     next
   };
 };
@@ -120,7 +120,7 @@ export function expandNotificationsSuccess(notifications, next) {
     type: NOTIFICATIONS_EXPAND_SUCCESS,
     notifications,
     accounts: notifications.map(item => item.account),
-    statuses: notifications.map(item => item.status),
+    statuses: notifications.map(item => item.status).filter(status => !!status),
     next
   };
 };