diff --git a/charts/pxc-db/Chart.yaml b/charts/pxc-db/Chart.yaml
index 4f1d5542..17f09f4d 100644
--- a/charts/pxc-db/Chart.yaml
+++ b/charts/pxc-db/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.4.0"
 description: A Helm chart for installing Percona XtraDB Cluster Databases using the PXC Operator.
 name: pxc-db
 home: https://www.percona.com/doc/kubernetes-operator-for-pxc/kubernetes.html
-version: 0.1.8
+version: 0.1.9
 maintainers:
   - name: paulczar
     email: username.taken@gmail.com
diff --git a/charts/pxc-db/production-values.yaml b/charts/pxc-db/production-values.yaml
index 25cc6698..fc053d37 100644
--- a/charts/pxc-db/production-values.yaml
+++ b/charts/pxc-db/production-values.yaml
@@ -14,6 +14,7 @@ nameOverride: "production"
 fullnameOverride: "production"
 
 pause: false
+allowUnsafeConfigurations: false
 
 pxc:
   size: 3
diff --git a/charts/pxc-db/templates/cluster.yaml b/charts/pxc-db/templates/cluster.yaml
index a71c7708..fe1eed88 100644
--- a/charts/pxc-db/templates/cluster.yaml
+++ b/charts/pxc-db/templates/cluster.yaml
@@ -27,13 +27,13 @@ spec:
   sslInternalSecretName: {{ include "pxc-database.fullname" . }}-ssl-internal
   {{- end }}
   {{- end }}
+  {{- if or .Values.allowUnsafeConfigurations .Values.pxc.disableTLS }}
+  allowUnsafeConfigurations: true
+  {{- end }}
   pause: {{ .Values.pause }}
   {{- $pxc := .Values.pxc }}
   pxc:
     size: {{ $pxc.size }}
-    {{- if .Values.pxc.disableTLS }}
-    allowUnsafeConfigurations: false
-    {{- end }}
     image: "{{ $pxc.image.repository }}:{{ $pxc.image.tag }}"
     readinessDelaySec: {{ $pxc.readinessDelaySec }}
     livenessDelaySec: {{ $pxc.livenessDelaySec }}
diff --git a/charts/pxc-db/values.yaml b/charts/pxc-db/values.yaml
index ab0024d5..269d9206 100644
--- a/charts/pxc-db/values.yaml
+++ b/charts/pxc-db/values.yaml
@@ -13,6 +13,7 @@ nameOverride: ""
 fullnameOverride: ""
 
 pause: false
+allowUnsafeConfigurations: false
 
 pxc:
   size: 3