diff --git a/frontend/src/api/hooks/newDashboard.ts b/frontend/src/api/hooks/newDashboard.ts
index 31018a46..30ed5d82 100644
--- a/frontend/src/api/hooks/newDashboard.ts
+++ b/frontend/src/api/hooks/newDashboard.ts
@@ -157,6 +157,7 @@ export function useBakeryHealthStatus(tenantId: string) {
       );
       return response.data;
     },
+    enabled: !!tenantId, // Only fetch when tenantId is available
     refetchInterval: 30000, // Refresh every 30 seconds
     staleTime: 20000, // Consider stale after 20 seconds
     retry: 2,
@@ -179,6 +180,7 @@ export function useOrchestrationSummary(tenantId: string, runId?: string) {
       );
       return response.data;
     },
+    enabled: !!tenantId, // Only fetch when tenantId is available
     staleTime: 60000, // Summary doesn't change often
     retry: 2,
   });
@@ -199,6 +201,7 @@ export function useActionQueue(tenantId: string) {
       );
       return response.data;
     },
+    enabled: !!tenantId, // Only fetch when tenantId is available
     refetchInterval: 60000, // Refresh every minute
     staleTime: 30000,
     retry: 2,
@@ -219,6 +222,7 @@ export function useProductionTimeline(tenantId: string) {
       );
       return response.data;
     },
+    enabled: !!tenantId, // Only fetch when tenantId is available
     refetchInterval: 60000, // Refresh every minute
     staleTime: 30000,
     retry: 2,
@@ -239,6 +243,7 @@ export function useInsights(tenantId: string) {
       );
       return response.data;
     },
+    enabled: !!tenantId, // Only fetch when tenantId is available
     refetchInterval: 120000, // Refresh every 2 minutes
     staleTime: 60000,
     retry: 2,