diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 3f22e53..19ddf1c 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -46,7 +46,7 @@ Storage Class
 {{- $storageClass :=  default (tpl ( default "" .Values.global.storageClass) .) }}
 {{- if $storageClass }}
 storageClassName: {{ $storageClass | quote }}
-{{- end }}
+{{- end -}}
 {{- end -}}
 
 {{/*
diff --git a/unittests/helm/statefulset.yaml b/unittests/helm/statefulset.yaml
index 29da1e8..d61922f 100644
--- a/unittests/helm/statefulset.yaml
+++ b/unittests/helm/statefulset.yaml
@@ -211,6 +211,18 @@ tests:
       - equal:
           path: spec.template.spec.runtimeClassName
           value: "my-runtime-class-name"
+  - it: should render storageClass correctly
+    template: templates/statefulset.yaml
+    set:
+      enabled: true
+      global:
+        storageClass: "test-storageclass"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: spec.volumeClaimTemplates[0].spec.storageClassName
+          value: "test-storageclass"
 
 #
 ## ACT_RUNNER