diff --git a/charts/mosquitto/Chart.yaml b/charts/mosquitto/Chart.yaml
index 415cdf5..cf30bf6 100644
--- a/charts/mosquitto/Chart.yaml
+++ b/charts/mosquitto/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.18
 description: Eclipse Mosquitto MQTT
 name: mosquitto
-version: 0.0.15
+version: 0.0.16
 type: application
 keywords:
 - mqtt
diff --git a/charts/mosquitto/templates/deployment.yaml b/charts/mosquitto/templates/deployment.yaml
index fd0016c..3fbd924 100644
--- a/charts/mosquitto/templates/deployment.yaml
+++ b/charts/mosquitto/templates/deployment.yaml
@@ -156,7 +156,8 @@ spec:
       - name: mosquitto-data
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ include "app.fullname" . }}
+          claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}
+          {{- end }}
       {{- else }}
         emptyDir: {}
       {{- end -}}
diff --git a/charts/mosquitto/values.yaml b/charts/mosquitto/values.yaml
index 1fd707e..64882a9 100644
--- a/charts/mosquitto/values.yaml
+++ b/charts/mosquitto/values.yaml
@@ -117,7 +117,7 @@ nodeSelector:
 affinity: {}
 tolerations: []
 persistence:
-  enabled: true
+  enabled: false
   storageClass: local-path
   accessMode: ReadWriteOnce
   size: 1Gi