diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 92c48fe206..d26394b0d4 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -183,7 +183,7 @@ class TagOrderStore extends Store {
                 const rooms =
                     GroupStore.getGroupRooms(groupId)
                     .map(r => client.getRoom(r.roomId)) // to Room objects
-                    .filter(r => !!r);   // filter out rooms we haven't joined from the group
+                    .filter(r => r !== null && r !== undefined);   // filter out rooms we haven't joined from the group
                 const badge = rooms && RoomNotifs.aggregateNotificationCount(rooms);
                 changedBadges[groupId] = (badge && badge.count !== 0) ? badge : undefined;
             });