diff --git a/charts/helm-dashboard/templates/pvc.yaml b/charts/helm-dashboard/templates/pvc.yaml
index 96d7336..68e0df3 100644
--- a/charts/helm-dashboard/templates/pvc.yaml
+++ b/charts/helm-dashboard/templates/pvc.yaml
@@ -14,8 +14,10 @@ spec:
   {{- if .Values.dashboard.persistence.hostPath }}
   storageClassName: ""
   {{- else }}
+  {{- if kindIs "string" .Values.dashboard.persistence.storageClass }}
   storageClassName: "{{ .Values.dashboard.persistence.storageClass }}"
   {{- end }}
+  {{- end }}
   accessModes:
   {{- if not (empty .Values.dashboard.persistence.accessModes) }}
   {{- range .Values.dashboard.persistence.accessModes }}
diff --git a/charts/helm-dashboard/values.yaml b/charts/helm-dashboard/values.yaml
index aa795db..15a308c 100644
--- a/charts/helm-dashboard/values.yaml
+++ b/charts/helm-dashboard/values.yaml
@@ -43,7 +43,7 @@ dashboard:
     ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
     ##   GKE, AWS & OpenStack)
     ##
-    storageClass: ""
+    storageClass: null
 
     ## Helm Dashboard Persistent Volume access modes
     ## Must match those of existing PV or dynamic provisioner