diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index 03907fd46b..65201134bf 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -145,7 +145,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             });
         } else {
             const lists = RoomListStore.instance.unfilteredLists;
-            TAG_ORDER.every(t => {
+            for (let i = 0; i < TAG_ORDER.length; i++) {
+                const t = TAG_ORDER[i];
                 const listRooms = lists[t];
                 const unreadRoom = listRooms.find((r: Room) => {
                     if (this.showInHomeSpace(r)) {
@@ -159,10 +160,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                         room_id: unreadRoom.roomId,
                         context_switch: true,
                     });
-                    return false;
+                    break;
                 }
-                return true;
-            });
+            }
         }
     }
 
diff --git a/src/stores/notifications/SummarizedNotificationState.ts b/src/stores/notifications/SummarizedNotificationState.ts
index 6b69e1d470..372da74f36 100644
--- a/src/stores/notifications/SummarizedNotificationState.ts
+++ b/src/stores/notifications/SummarizedNotificationState.ts
@@ -16,7 +16,6 @@ limitations under the License.
 
 import { NotificationColor } from "./NotificationColor";
 import { NotificationState } from "./NotificationState";
-import { RoomNotificationState } from "./RoomNotificationState";
 
 /**
  * Summarizes a number of states into a unique snapshot. To populate, call
@@ -26,7 +25,6 @@ import { RoomNotificationState } from "./RoomNotificationState";
  */
 export class SummarizedNotificationState extends NotificationState {
     private totalStatesWithUnread = 0;
-    private unreadRoomId: string;
 
     constructor() {
         super();
@@ -47,7 +45,7 @@ export class SummarizedNotificationState extends NotificationState {
      * @param includeSymbol If true, the notification state's symbol will be taken if one
      * is present.
      */
-    public add(other: RoomNotificationState, includeSymbol = false) {
+    public add(other: NotificationState, includeSymbol = false) {
         if (other.symbol && includeSymbol) {
             this._symbol = other.symbol;
         }