diff --git a/chart/templates/grafana/values.yaml b/chart/templates/grafana/values.yaml
index 84399b593142b1b89996221e1e1e514aa40f0067..36614f8c25a98c1c2b09f4299b80d98a612e5905 100644
--- a/chart/templates/grafana/values.yaml
+++ b/chart/templates/grafana/values.yaml
@@ -257,7 +257,7 @@ grafana.ini:
     {{- list "tls_client_key" .tls_client_key | include "bigbang.addValueIfSet" | indent 4 }}
   {{- end }}
 
-{{- if and (or .Values.grafana.sso.grafana.client_id (dig "grafana" "client_id" false .Values.monitoring.sso)) (or .Values.sso.certificate_authority (dig "certificateAuthority" "cert" false .Values.sso)) }}
+{{- if or (or .Values.grafana.sso.grafana.client_id (dig "grafana" "client_id" false .Values.monitoring.sso)) (or .Values.sso.certificate_authority (dig "certificateAuthority" "cert" false .Values.sso)) }}
 extraSecretMounts:
   {{- if or (and .Values.grafana.sso.enabled .Values.grafana.sso.grafana.client_id) (and (dig "grafana" "client_id" false .Values.monitoring.sso) .Values.monitoring.sso.enabled) }}
   - name: auth-generic-oauth-secret
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 4e7eae2bb47f4b3f8f66ba8fc456e7d380454329..aad0f4ba17df34e67db0aaebc24dc6dc48242bf9 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -170,6 +170,7 @@ gatekeeper:
           - keycloak/keycloak-cypress-test
           - jaeger/jaeger-cypress-test
           - monitoring/monitoring-cypress-test
+          - monitoring/grafana-cypress-test
           - vault/vault-cypress-test
           - logging/loki-cypress-test
           - twistlock/twistlock-cypress-test
@@ -304,6 +305,7 @@ gatekeeper:
           - keycloak/keycloak-cypress-test
           - jaeger/jaeger-cypress-test
           - monitoring/monitoring-cypress-test
+          - monitoring/grafana-cypress-test
           - vault/vault-cypress-test
           - logging/loki-cypress-test
           - twistlock/twistlock-cypress-test