diff --git a/charts/cryptpad/Chart.yaml b/charts/cryptpad/Chart.yaml
index 209e828..bc65b1e 100644
--- a/charts/cryptpad/Chart.yaml
+++ b/charts/cryptpad/Chart.yaml
@@ -21,7 +21,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.11
+version: 0.0.12
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/cryptpad/templates/cryptpad.yaml b/charts/cryptpad/templates/cryptpad.yaml
index b734636..2610dce 100644
--- a/charts/cryptpad/templates/cryptpad.yaml
+++ b/charts/cryptpad/templates/cryptpad.yaml
@@ -46,7 +46,7 @@ spec:
         volumeMounts:
           - name: cryptpad-data
             mountPath: /cryptpad/data
-            {{- if .Values.persistence.cryptpad.data.existingClaim }}
+            {{- if and .Values.persistence .Values.persistence.cryptpad.data.existingClaim }}
               persistentVolumeClaim:
                 claimName: {{ tpl .Values.persistence.cryptpad.data.existingClaim $ }}
             {{- end }}
@@ -167,11 +167,15 @@ spec:
         {{- end }}
     {{- end }}
     {{- end }}
-{{- end }}
-{{- if and .Values.persistence.enabled (not .Values.workloadStateful) }}
+{{- else if .Values.persistence.enabled }}
   {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
       - name: cryptpad-{{ $dir }}
         persistentVolumeClaim:
           claimName: cryptpad-{{ $dir }}
   {{- end }}
+{{- else }}
+  {{- range $dir, $dirvalues := .Values.persistence.cryptpad }}
+      - name: cryptpad-{{ $dir }}
+        emptyDir: {}
+  {{- end }}
 {{- end }}