diff --git a/public/pages/TopNQueries/TopNQueries.test.tsx b/public/pages/TopNQueries/TopNQueries.test.tsx
index f7ea162..4afff75 100644
--- a/public/pages/TopNQueries/TopNQueries.test.tsx
+++ b/public/pages/TopNQueries/TopNQueries.test.tsx
@@ -209,7 +209,7 @@ describe('TopNQueries Component', () => {
     );
     // Verify that the component re-fetches data for the new time range
     await waitFor(() => {
-      expect(mockCore.http.get).toHaveBeenCalledTimes(16);
+      expect(mockCore.http.get).toHaveBeenCalledTimes(7);
       expect(mockCore.http.get).toHaveBeenCalledWith('/api/settings', expect.any(Object));
       expect(mockCore.http.get).toHaveBeenCalledWith(
         '/api/top_queries/latency',
diff --git a/public/pages/TopNQueries/TopNQueries.tsx b/public/pages/TopNQueries/TopNQueries.tsx
index ee011a7..b15fe44 100644
--- a/public/pages/TopNQueries/TopNQueries.tsx
+++ b/public/pages/TopNQueries/TopNQueries.tsx
@@ -163,6 +163,8 @@ const TopNQueries = ({
   // TODO: refactor retrieveQueries and retrieveConfigInfo into a Util function
   const retrieveQueries = useCallback(
     async (start: string, end: string) => {
+      if (loading) return;
+      setLoading(true);
       const nullResponse = { response: { top_queries: [] } };
       const apiParams = {
         query: {
@@ -190,7 +192,6 @@ const TopNQueries = ({
         }
       };
       try {
-        setLoading(true);
         const respLatency = latencySettings.isEnabled
           ? await fetchMetric('/api/top_queries/latency')
           : nullResponse;