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>) {