diff --git a/charts/drill/Chart.yaml b/charts/drill/Chart.yaml
index 74b891f..67324bb 100644
--- a/charts/drill/Chart.yaml
+++ b/charts/drill/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: drill
-version: 1.2.12
+version: 1.2.13
 appVersion: 1.21.1
 description: Helm Charts for deploying Apache Drill Clusters on Kubernetes
 icon: https://raw.githubusercontent.com/wearefrank/charts/master/charts/drill/icon.svg
diff --git a/charts/drill/templates/persistenvolumeclaim.yaml b/charts/drill/templates/persistenvolumeclaim.yaml
index d42f0e1..818c963 100644
--- a/charts/drill/templates/persistenvolumeclaim.yaml
+++ b/charts/drill/templates/persistenvolumeclaim.yaml
@@ -18,7 +18,13 @@ spec:
   selector:
     {{- toYaml . | nindent 6 }}
   {{- end }}
+  {{- if .Values.persistence.storageClass }}
+  {{- if eq "-" .Values.persistence.storageClass}}
+  storageClassName: ""
+  {{- else }}
   storageClassName: {{ .Values.persistence.storageClass | quote }}
+  {{- end }}
+  {{- end }}
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
diff --git a/charts/drill/templates/statefulset.yaml b/charts/drill/templates/statefulset.yaml
index 02d5a08..398ba76 100644
--- a/charts/drill/templates/statefulset.yaml
+++ b/charts/drill/templates/statefulset.yaml
@@ -164,7 +164,13 @@ spec:
         selector:
           {{- toYaml . | nindent 10 }}
         {{- end }}
+        {{- if .Values.persistence.storageClass }}
+        {{- if eq "-" .Values.persistence.storageClass}}
+        storageClassName: ""
+        {{- else }}
         storageClassName: {{ .Values.persistence.storageClass | quote }}
+        {{- end }}
+        {{- end }}
         resources:
           requests:
             storage: {{ .Values.persistence.dataLogDir.size | quote }}