From 593b472e5015711755a9f739c4336b024743fdd4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Jul 2020 13:59:09 -0600
Subject: [PATCH 1/2] Ensure notification badges stop listening when they
 unmount

---
 src/components/views/rooms/NotificationBadge.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index d215df9126..72408b9579 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -72,6 +72,9 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
 
     public componentWillUnmount() {
         SettingsStore.unwatchSetting(this.countWatcherRef);
+        if (this.props.notification) {
+            this.props.notification.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
+        }
     }
 
     public componentDidUpdate(prevProps: Readonly<IProps>) {

From 8e7b60b11e5b4fdc8032f34c4555dd975c536e46 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Jul 2020 14:07:37 -0600
Subject: [PATCH 2/2] Remove useless if statement

---
 src/components/views/rooms/NotificationBadge.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/views/rooms/NotificationBadge.tsx b/src/components/views/rooms/NotificationBadge.tsx
index 72408b9579..ab6ec3fbed 100644
--- a/src/components/views/rooms/NotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge.tsx
@@ -72,9 +72,7 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
 
     public componentWillUnmount() {
         SettingsStore.unwatchSetting(this.countWatcherRef);
-        if (this.props.notification) {
-            this.props.notification.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
-        }
+        this.props.notification.off(NOTIFICATION_STATE_UPDATE, this.onNotificationUpdate);
     }
 
     public componentDidUpdate(prevProps: Readonly<IProps>) {