diff --git a/client/src/javascript/components/sidebar/NotificationsButton.tsx b/client/src/javascript/components/sidebar/NotificationsButton.tsx
index 07fc3acf..1c8daf79 100644
--- a/client/src/javascript/components/sidebar/NotificationsButton.tsx
+++ b/client/src/javascript/components/sidebar/NotificationsButton.tsx
@@ -71,7 +71,12 @@ class NotificationsButton extends Component<WrappedComponentProps, Notifications
   constructor(props: WrappedComponentProps) {
     super(props);
 
-    reaction(() => NotificationStore.notificationCount, this.handleNotificationCountChange);
+    reaction(
+      () => NotificationStore.notificationCount,
+      (count) => {
+        if (count.total > 0 && this.tooltipRef?.isOpen()) this.fetchNotifications();
+      },
+    );
 
     this.state = {
       isLoading: false,
@@ -225,12 +230,6 @@ class NotificationsButton extends Component<WrappedComponentProps, Notifications
     FloodActions.clearNotifications();
   };
 
-  handleNotificationCountChange = () => {
-    if (this.tooltipRef != null && this.tooltipRef.isOpen()) {
-      this.fetchNotifications();
-    }
-  };
-
   handleNewerNotificationsClick = () => {
     if (this.state.paginationStart - NOTIFICATIONS_PER_PAGE >= 0) {
       this.setState((state) => {