diff --git a/packages/client/src/components/app/DataProvider.svelte b/packages/client/src/components/app/DataProvider.svelte
index c313a8b6c2..f049e1b9f3 100644
--- a/packages/client/src/components/app/DataProvider.svelte
+++ b/packages/client/src/components/app/DataProvider.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { getContext } from "svelte"
+  import { getContext, onDestroy } from "svelte"
   import { Pagination, ProgressCircle } from "@budibase/bbui"
   import { fetchData, QueryUtils } from "@budibase/frontend-core"
   import type {
@@ -175,6 +175,10 @@
       interval = setInterval(fetch.refresh, Math.max(10000, autoRefresh * 1000))
     }
   }
+
+  onDestroy(() => {
+    clearInterval(interval) // Clears auto-refresh when navigating away
+  })
 </script>
 
 <div use:styleable={$component.styles} class="container">