diff --git a/helm-charts/infisical/templates/backend-deployment.yaml b/helm-charts/infisical/templates/backend-deployment.yaml
index 0c239867b..6a2faa688 100644
--- a/helm-charts/infisical/templates/backend-deployment.yaml
+++ b/helm-charts/infisical/templates/backend-deployment.yaml
@@ -22,7 +22,7 @@ spec:
         - containerPort: 4000
         env:
         {{- range $key, $value := .Values.backendEnvironmentVariables }}
-        {{- if eq $value "MUST_REPLACE" }}
+        {{- if $value | quote | eq "MUST_REPLACE" }}
           {{ fail "Environment variables are not set. Please set all environment variables to continue." }}
         {{ end }}
         - name: {{ $key }}
diff --git a/helm-charts/infisical/templates/frontend-deployment.yaml b/helm-charts/infisical/templates/frontend-deployment.yaml
index 79bf8837b..3cd29f326 100644
--- a/helm-charts/infisical/templates/frontend-deployment.yaml
+++ b/helm-charts/infisical/templates/frontend-deployment.yaml
@@ -20,6 +20,9 @@ spec:
         imagePullPolicy: {{ .Values.frontend.image.pullPolicy }}
         env:
         {{- range $key, $value := .Values.frontendEnvironmentVariables }}
+        {{- if $value | quote | eq "MUST_REPLACE" }}
+          {{ fail "Environment variables are not set. Please set all environment variables to continue." }}
+        {{ end }}
         - name: {{ $key }}
           value: {{ quote $value }}
         {{- end }}