diff --git a/changelog.d/3-bug-fixes/fix-duplicated-enable-payment-flag-in-helm-charts b/changelog.d/3-bug-fixes/fix-duplicated-enable-payment-flag-in-helm-charts
new file mode 100644
index 0000000000..e739347931
--- /dev/null
+++ b/changelog.d/3-bug-fixes/fix-duplicated-enable-payment-flag-in-helm-charts
@@ -0,0 +1,4 @@
+When `config.enablePayment` and `FEATURE_ENABLE_PAYMENT` (`envVars`) were set,
+the team-settings feature flag `FEATURE_ENABLE_PAYMENT` was rendered two times.
+The new behavior is to give the `envVars` entry priority. I.e. when it's set,
+it's used instead of the `config.enablePayment` value.
diff --git a/charts/team-settings/templates/deployment.yaml b/charts/team-settings/templates/deployment.yaml
index f0f21f0e26..467d632445 100644
--- a/charts/team-settings/templates/deployment.yaml
+++ b/charts/team-settings/templates/deployment.yaml
@@ -40,10 +40,13 @@ spec:
             value: https://{{ .Values.config.externalUrls.backendRest }}
           - name: BACKEND_WS
             value: wss://{{ .Values.config.externalUrls.backendWebsocket }}
+
+          {{- if not (hasKey .Values.envVars "FEATURE_ENABLE_PAYMENT") }}
             # NOTE defaults to 'true', but since we assume on-prem here, we default to 'false'
             # SRC https://github.com/wireapp/wire-web-config-default/blob/master/wire-team-settings/.env.defaults#L48
           - name: FEATURE_ENABLE_PAYMENT
             value: {{ .Values.config.enablePayment | default false | quote }}
+          {{- end }}
       {{- range $key, $val := .Values.envVars }}
           - name: {{ $key }}
             value: {{ $val | quote }}