diff --git a/src/webapp/features/notifications/lib/queries/useUnreadNotificationCount.tsx b/src/webapp/features/notifications/lib/queries/useUnreadNotificationCount.tsx
index d74a7e70..f885b49a 100644
--- a/src/webapp/features/notifications/lib/queries/useUnreadNotificationCount.tsx
+++ b/src/webapp/features/notifications/lib/queries/useUnreadNotificationCount.tsx
@@ -2,23 +2,14 @@ import { useQuery } from '@tanstack/react-query';
 import { getUnreadNotificationCount } from '../dal';
 import { notificationKeys } from '../notificationKeys';
 import { useAuth } from '@/hooks/useAuth';
-import { ApiError } from '@/api-client';
 
 export default function useUnreadNotificationCount() {
-  const { logout } = useAuth();
+  const { isAuthenticated } = useAuth();
 
   const query = useQuery({
     queryKey: notificationKeys.unreadCount(),
-    queryFn: async () => {
-      try {
-        return await getUnreadNotificationCount();
-      } catch (error) {
-        if (error instanceof ApiError && error.statusCode === 401) {
-          logout();
-        }
-        throw error;
-      }
-    },
+    queryFn: getUnreadNotificationCount,
+    enabled: isAuthenticated,
     staleTime: 3000,
     refetchInterval: 20000,
     refetchOnWindowFocus: true,