diff --git a/universalmessaging/helm/templates/statefulset.yaml b/universalmessaging/helm/templates/statefulset.yaml
index e5204c6..dfae74c 100644
--- a/universalmessaging/helm/templates/statefulset.yaml
+++ b/universalmessaging/helm/templates/statefulset.yaml
@@ -193,7 +193,9 @@ spec:
       resources:
         requests:
           storage: {{ .Values.storage.dataSize }}
+      {{- if .Values.storage.data.storageClassName }}
       storageClassName: {{ .Values.storage.data.storageClassName | quote }}
+      {{- end }}
   - metadata:
       name: logs
       {{- with .Values.storage.logs.annotations }}
@@ -206,7 +208,9 @@ spec:
       resources:
         requests:
           storage: {{ .Values.storage.logsSize }}
+      {{- if .Values.storage.logs.storageClassName }}
       storageClassName: {{ .Values.storage.logs.storageClassName | quote }}
+      {{- end }}
   - metadata:
       name: configuration
       {{- with .Values.storage.configuration.annotations }}
@@ -219,4 +223,6 @@ spec:
       resources:
         requests:
           storage: {{ .Values.storage.configurationSize }}
-      storageClassName: {{ .Values.storage.configuration.storageClassName | quote }}
\ No newline at end of file
+      {{- if .Values.storage.configuration.storageClassName }}
+      storageClassName: {{ .Values.storage.configuration.storageClassName | quote }}
+      {{- end }}