diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml
index a5ab6652a..c1304cde8 100644
--- a/charts/datahub/Chart.yaml
+++ b/charts/datahub/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for LinkedIn DataHub
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.2.116
+version: 0.2.117
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: 0.9.1
diff --git a/charts/datahub/templates/datahub-upgrade/_upgrade.tpl b/charts/datahub/templates/datahub-upgrade/_upgrade.tpl
index 0f6290052..eed07d40f 100644
--- a/charts/datahub/templates/datahub-upgrade/_upgrade.tpl
+++ b/charts/datahub/templates/datahub-upgrade/_upgrade.tpl
@@ -26,6 +26,7 @@ Return the env variables for upgrade jobs
   value: "{{ .Values.global.sql.datasource.url }}"
 - name: EBEAN_DATASOURCE_DRIVER
   value: "{{ .Values.global.sql.datasource.driver }}"
+{{- if .Values.global.datahub.metadata_service_authentication.enabled }}
 - name: DATAHUB_SYSTEM_CLIENT_ID
   value: {{ .Values.global.datahub.metadata_service_authentication.systemClientId }}
 - name: DATAHUB_SYSTEM_CLIENT_SECRET
@@ -33,6 +34,7 @@ Return the env variables for upgrade jobs
     secretKeyRef:
       name: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretRef }}
       key: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretKey }}
+{{- end }}
 - name: KAFKA_BOOTSTRAP_SERVER
   value: "{{ .Values.global.kafka.bootstrap.server }}"
 - name: KAFKA_SCHEMAREGISTRY_URL