diff --git a/public/app/features/alerting/unified/hooks/useCombinedRule.ts b/public/app/features/alerting/unified/hooks/useCombinedRule.ts index 21c64a2e4b5..b3070d21904 100644 --- a/public/app/features/alerting/unified/hooks/useCombinedRule.ts +++ b/public/app/features/alerting/unified/hooks/useCombinedRule.ts @@ -67,7 +67,7 @@ export function useCloudCombinedRulesMatching( const { dsFeatures, isLoadingDsFeatures } = useDataSourceFeatures(ruleSourceName); const { - currentData: promRuleNs = [], + currentData, isLoading: isLoadingPromRules, error: promRuleNsError, } = alertRuleApi.endpoints.prometheusRuleNamespaces.useQuery({ @@ -87,6 +87,7 @@ export function useCloudCombinedRulesMatching( if (promRuleNsError) { throw new Error('Unable to obtain Prometheus rules'); } + const promRuleNs = currentData || []; const rulerGroups: RulerRuleGroupDTO[] = []; if (dsFeatures?.rulerConfig) { @@ -114,7 +115,7 @@ export function useCloudCombinedRulesMatching( const rules = namespaces.flatMap((ns) => ns.groups.flatMap((group) => group.rules)); return rules; - }, [dsSettings, dsFeatures, isLoadingPromRules, promRuleNsError, promRuleNs, fetchRulerRuleGroup]); + }, [dsSettings, dsFeatures, isLoadingPromRules, promRuleNsError, currentData, fetchRulerRuleGroup]); return { loading: isLoadingDsFeatures || loading, error: error, rules: value }; }