diff --git a/charts/mattermost-push-proxy/Chart.yaml b/charts/mattermost-push-proxy/Chart.yaml
index 1cc7d760..15937e33 100644
--- a/charts/mattermost-push-proxy/Chart.yaml
+++ b/charts/mattermost-push-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 description: Mattermost Push Proxy server
 name: mattermost-push-proxy
 type: application
-version: 0.12.7
+version: 0.12.8
 appVersion: 6.1.0
 keywords:
   - mattermost
diff --git a/charts/mattermost-push-proxy/templates/push-config.tpl b/charts/mattermost-push-proxy/templates/push-config.tpl
index 36827466..0cfbd909 100644
--- a/charts/mattermost-push-proxy/templates/push-config.tpl
+++ b/charts/mattermost-push-proxy/templates/push-config.tpl
@@ -15,7 +15,7 @@
             {{- else }}
             "ApplePushCertPrivate": "/certs/apple-push-cert.pem",
 	    {{- end }}
-        {{- if eq .Values.applePushSettings.authKey "" }}
+        {{- if and (eq .Values.applePushSettings.authKey "") (eq .Values.externalSecrets.enabled false) }}
             "AppleAuthKeyFile":"",
             "AppleAuthKeyID":"",
             "AppleTeamID":"",
@@ -55,7 +55,7 @@
         {{- else }}
             "ApplePushCertPrivate": "/certs/apple-rnbeta-push-cert.pem",
         {{- end }}
-        {{- if eq .Values.applePushSettings.authKey "" }}
+        {{- if and (eq .Values.applePushSettings.authKey "") (eq .Values.externalSecrets.enabled false) }}
             "AppleAuthKeyFile":"",
             "AppleAuthKeyID":"",
             "AppleTeamID":"",