diff --git a/charts/stable/n8n/Chart.yaml b/charts/stable/n8n/Chart.yaml
index 6f4316e5079..df6d1c336a4 100644
--- a/charts/stable/n8n/Chart.yaml
+++ b/charts/stable/n8n/Chart.yaml
@@ -28,7 +28,7 @@ sources:
 - https://docs.n8n.io/
 - https://github.com/n8n-io/n8n
 - https://hub.docker.com/r/n8nio/n8n
-version: 2.0.20
+version: 2.0.21
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/n8n/templates/_configmap.tpl b/charts/stable/n8n/templates/_configmap.tpl
index 20f0c80d25f..8972fa71e9e 100644
--- a/charts/stable/n8n/templates/_configmap.tpl
+++ b/charts/stable/n8n/templates/_configmap.tpl
@@ -73,10 +73,10 @@ data:
   {{- if .Values.executions.EXECUTIONS_MODE }}
   EXECUTIONS_MODE: {{ .Values.executions.EXECUTIONS_MODE | quote }}
   {{- end }}
-  {{- if .Values.executions.EXECUTIONS_TIMEOUT }}
+  {{- if or .Values.executions.EXECUTIONS_TIMEOUT ( eq 0 .Values.executions.EXECUTIONS_TIMEOUT ) }}
   EXECUTIONS_TIMEOUT: {{ .Values.executions.EXECUTIONS_TIMEOUT | quote }}
   {{- end }}
-  {{- if .Values.executions.EXECUTIONS_TIMEOUT_MAX }}
+  {{- if or .Values.executions.EXECUTIONS_TIMEOUT_MAX ( eq 0 .Values.executions.EXECUTIONS_TIMEOUT_MAX ) }}
   EXECUTIONS_TIMEOUT_MAX: {{ .Values.executions.EXECUTIONS_TIMEOUT_MAX | quote }}
   {{- end }}
   {{- if .Values.executions.EXECUTIONS_DATA_SAVE_ON_ERROR }}
@@ -94,10 +94,10 @@ data:
   {{- if .Values.executions.EXECUTIONS_DATA_PRUNE }}
   EXECUTIONS_DATA_PRUNE: {{ .Values.executions.EXECUTIONS_DATA_PRUNE | quote }}
   {{- end }}
-  {{- if .Values.executions.EXECUTIONS_DATA_MAX_AGE }}
+  {{- if or .Values.executions.EXECUTIONS_DATA_MAX_AGE ( eq 0 .Values.executions.EXECUTIONS_DATA_MAX_AGE ) }}
   EXECUTIONS_DATA_MAX_AGE: {{ .Values.executions.EXECUTIONS_DATA_MAX_AGE | quote }}
   {{- end }}
-  {{- if .Values.executions.EXECUTIONS_DATA_PRUNE_TIMEOUT }}
+  {{- if or .Values.executions.EXECUTIONS_DATA_PRUNE_TIMEOUT ( eq 0 .Values.executions.EXECUTIONS_DATA_PRUNE_TIMEOUT ) }}
   EXECUTIONS_DATA_PRUNE_TIMEOUT: {{ .Values.executions.EXECUTIONS_DATA_PRUNE_TIMEOUT | quote }}
   {{- end }}
   {{/*  Endpoints */}}