diff --git a/chart/templates/grafana/values.yaml b/chart/templates/grafana/values.yaml
index 36614f8c25a98c1c2b09f4299b80d98a612e5905..0ab158652ab1ba889bf5f4a8cdf74aebb5e103da 100644
--- a/chart/templates/grafana/values.yaml
+++ b/chart/templates/grafana/values.yaml
@@ -93,16 +93,19 @@ podAnnotations:
   {{- end }}
 {{- end }}
 
-{{- if or .Values.loki.enabled .Values.tempo.enabled $gitlabRedis $authserviceRedisEnabled .Values.addons.argocd.enabled }}
+{{- if or .Values.monitoring.enabled .Values.loki.enabled .Values.tempo.enabled $gitlabRedis $authserviceRedisEnabled .Values.addons.argocd.enabled }}
 datasources:
   datasourcesbb.yaml:
     apiVersion: 1
     datasources:
+    {{- if .Values.monitoring.enabled }}
     - name: Prometheus
       type: prometheus
+      uid: prometheus
       access: proxy
       url: http://monitoring-monitoring-kube-prometheus.monitoring.svc:9090
       editable: true
+    {{- end }}
     {{- if .Values.addons.argocd.enabled }}
     - name: Argo Master
       type: redis-datasource