diff --git a/public/app/features/alerting/unified/initAlerting.tsx b/public/app/features/alerting/unified/initAlerting.tsx index e043057330f..f7dfc3b0811 100644 --- a/public/app/features/alerting/unified/initAlerting.tsx +++ b/public/app/features/alerting/unified/initAlerting.tsx @@ -14,15 +14,17 @@ const AlertRulesToolbarButton = React.lazy( export function initAlerting() { const grafanaRulesPermissions = getRulesPermissions(GRAFANA_RULES_SOURCE_NAME); + const alertingEnabled = config.unifiedAlertingEnabled || (config.featureToggles.alertingPreviewUpgrade ?? false); if (contextSrv.hasPermission(grafanaRulesPermissions.read)) { addCustomRightAction({ - show: () => config.unifiedAlertingEnabled || (config.featureToggles.alertingPreviewUpgrade ?? false), - component: ({ dashboard }) => ( - - {dashboard && } - - ), + show: () => alertingEnabled, + component: ({ dashboard }) => + alertingEnabled ? ( + + {dashboard && } + + ) : null, index: -2, }); }