diff --git a/tools/pytorchjob-generator/chart/templates/_helpers.tpl b/tools/pytorchjob-generator/chart/templates/_helpers.tpl
index d4aa42e..f4e4fd4 100644
--- a/tools/pytorchjob-generator/chart/templates/_helpers.tpl
+++ b/tools/pytorchjob-generator/chart/templates/_helpers.tpl
@@ -29,7 +29,7 @@ annotations:
 
 
 {{- define "mlbatch.schedulingSpec" }}
-{{- if .Values.terminationGracePeriodSeconds }}
+{{- if ne .Values.terminationGracePeriodSeconds nil }}
 terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
 {{- end }}
 {{- if .Values.bypassCoscheduler }}
diff --git a/tools/pytorchjob-generator/chart/templates/appwrapper.yaml b/tools/pytorchjob-generator/chart/templates/appwrapper.yaml
index 91420fc..6b8543c 100644
--- a/tools/pytorchjob-generator/chart/templates/appwrapper.yaml
+++ b/tools/pytorchjob-generator/chart/templates/appwrapper.yaml
@@ -67,7 +67,7 @@ metadata:
         {{- if .Values.retryPausePeriodDuration }}
         workload.codeflare.dev.appwrapper/retryPausePeriodDuration: "{{ .Values.retryPausePeriodDuration }}"
         {{- end }}
-        {{- if .Values.retryLimit }}
+        {{- if ne .Values.retryLimit nil }}
         workload.codeflare.dev.appwrapper/retryLimit: "{{ .Values.retryLimit }}"
         {{- end }}
         {{- if .Values.forcefulDeletionGracePeriodDuration }}