diff --git a/charts/galley/templates/configmap.yaml b/charts/galley/templates/configmap.yaml
index 405f37de74d..9a877ab26ff 100644
--- a/charts/galley/templates/configmap.yaml
+++ b/charts/galley/templates/configmap.yaml
@@ -59,11 +59,13 @@ data:
       enableIndexedBillingTeamMembers: {{ .settings.enableIndexedBillingTeamMembers }}
       {{- end }}
       federationDomain: {{ .settings.federationDomain }}
+      {{- if $.Values.secrets.mlsPrivateKeys }}
       mlsPrivateKeyPaths:
         {{- if $.Values.secrets.mlsPrivateKeys.removal.ed25519 }}
         removal:
           ed25519: "/etc/wire/galley/secrets/removal_ed25519.pem"
         {{- end }}
+      {{- end -}}
       {{- if .settings.featureFlags }}
       featureFlags:
         sso: {{ .settings.featureFlags.sso }}
diff --git a/charts/galley/templates/mls-secret.yaml b/charts/galley/templates/mls-secret.yaml
index 7f03f292d8b..1b77c325a9a 100644
--- a/charts/galley/templates/mls-secret.yaml
+++ b/charts/galley/templates/mls-secret.yaml
@@ -9,6 +9,8 @@ metadata:
     heritage: "{{ .Release.Service }}"
 type: Opaque
 data:
+  {{- if .Values.secrets.mlsPrivateKeys }}
   {{- if .Values.secrets.mlsPrivateKeys.removal.ed25519 }}
   removal_ed25519.pem: {{ .Values.secrets.mlsPrivateKeys.removal.ed25519 | b64enc | quote }}
   {{- end -}}
+  {{- end -}}