diff --git a/deploy/helm/fire/templates/deployments-statefulsets.yaml b/deploy/helm/fire/templates/deployments-statefulsets.yaml
index 5a5b0b2dcf..34cfb09580 100644
--- a/deploy/helm/fire/templates/deployments-statefulsets.yaml
+++ b/deploy/helm/fire/templates/deployments-statefulsets.yaml
@@ -58,11 +58,13 @@ spec:
           {{- range $key, $value := $cfg.extraArgs }}
             - "-{{ $key }}={{ $value }}"
           {{- end }}
+          {{- with .Values.fire.extraEnvVars }}
           env:
-           {{- range $key, $value := .Values.fire.extraEnvVars }}
+           {{- range $key, $value := . }}
             - name: {{ $key }}
               value: {{ $value }}
            {{- end }}
+          {{- end }}
           ports:
             - name: {{ .Values.fire.service.port_name }}
               containerPort: {{ .Values.fire.service.port }}