diff --git a/client/src/pages/dashboard/contexts/DashboardContext.tsx b/client/src/pages/dashboard/contexts/DashboardContext.tsx
index 39c4838..310718e 100644
--- a/client/src/pages/dashboard/contexts/DashboardContext.tsx
+++ b/client/src/pages/dashboard/contexts/DashboardContext.tsx
@@ -88,7 +88,7 @@ export const DashboardContextProvider = ({
 		if (dashboards.data && !dashboards.isFetching && !isDashboardSelected) {
 			setDashboardId(dashboards.data[0]?.id)
 		}
-	}, [dashboards.data, isDashboardSelected])
+	}, [dashboards.data, isDashboardSelected, dashboards.isFetching])
 
 	const [filter, setFilter] = useState<FilterValue>(() => {
 		const range = intervalToRange('week', new Date(), new Date())