diff --git a/helm/flowforge/templates/configmap.yaml b/helm/flowforge/templates/configmap.yaml
index 9c00b972..8cb7e911 100644
--- a/helm/flowforge/templates/configmap.yaml
+++ b/helm/flowforge/templates/configmap.yaml
@@ -129,7 +129,7 @@ data:
       http: info
     telemetry:
       enabled: {{ .Values.forge.telemetry.enabled }}
-      {{ if or (.Values.forge.telemetry.plausible) (.Values.forge.telemetry.posthog) (hasKey .Values.forge.telemetry.sentry "frontend_dsn") }}
+      {{ if or (.Values.forge.telemetry.plausible) (.Values.forge.telemetry.posthog) (and (hasKey .Values.forge.telemetry "sentry") (hasKey .Values.forge.telemetry.sentry "frontend_dsn")) }}
       frontend:
         {{ if .Values.forge.telemetry.plausible -}}
         plausible:
diff --git a/helm/flowforge/templates/deployment.yaml b/helm/flowforge/templates/deployment.yaml
index 94e3c6d5..4bb1f431 100644
--- a/helm/flowforge/templates/deployment.yaml
+++ b/helm/flowforge/templates/deployment.yaml
@@ -58,7 +58,7 @@ spec:
         - name: NODE_EXTRA_CA_CERTS
           value: /usr/local/ssl-certs/chain.pem
         {{- end }}
-        {{- if .Values.forge.telemetry.sentry.environment }}
+        {{- if and (hasKey .Values.forge.telemetry "sentry") (hasKey .Values.forge.telemetry.sentry "environment") }}
         - name: SENTRY_ENV
           value: {{ .Values.forge.telemetry.sentry.environment }}
         {{- end }}