diff --git a/helm/dendrite/templates/pvc.yaml b/helm/dendrite/templates/pvc.yaml
index 897957e60..88eff3bed 100644
--- a/helm/dendrite/templates/pvc.yaml
+++ b/helm/dendrite/templates/pvc.yaml
@@ -12,7 +12,7 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.media.capacity }}
-  storageClassName: {{ .Values.persistence.storageClass }}
+  storageClassName: {{ default .Values.persistence.storageClass .Values.persistence.media.storageClass }}
 {{ end }}
 {{ if not .Values.persistence.jetstream.existingClaim }}
 ---
@@ -28,7 +28,7 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.jetstream.capacity }}
-  storageClassName: {{ .Values.persistence.storageClass }}
+  storageClassName: {{ default .Values.persistence.storageClass .Values.persistence.jetstream.storageClass }}
 {{ end }}
 {{ if not .Values.persistence.search.existingClaim }}
 ---
@@ -44,5 +44,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.search.capacity }}
-  storageClassName: {{ .Values.persistence.storageClass }}
-{{ end }}
\ No newline at end of file
+  storageClassName: {{ default .Values.persistence.storageClass .Values.persistence.search.storageClass }}
+{{ end }}
diff --git a/helm/dendrite/values.yaml b/helm/dendrite/values.yaml
index 41ec1c390..f3db507d4 100644
--- a/helm/dendrite/values.yaml
+++ b/helm/dendrite/values.yaml
@@ -24,24 +24,34 @@ resources:
     memory: "4096Mi"
 
 persistence:
-  # -- The storage class to use for volume claims. Defaults to the
-  # cluster default storage class.
+  # -- The storage class to use for volume claims.
+  # Used unless specified at the specific component.
+  # Defaults to the cluster default storage class.
   storageClass: ""
   jetstream:
     # -- Use an existing volume claim for jetstream
     existingClaim: ""
     # -- PVC Storage Request for the jetstream volume
     capacity: "1Gi"
+    # -- The storage class to use for volume claims.
+    # Defaults to persistence.storageClass
+    storageClass: ""
   media:
     # -- Use an existing volume claim for media files
     existingClaim: ""
     # -- PVC Storage Request for the media volume
     capacity: "1Gi"
+    # -- The storage class to use for volume claims.
+    # Defaults to persistence.storageClass
+    storageClass: ""
   search:
     # -- Use an existing volume claim for the fulltext search index
     existingClaim: ""
     # -- PVC Storage Request for the search volume
     capacity: "1Gi"
+    # -- The storage class to use for volume claims.
+    # Defaults to persistence.storageClass
+    storageClass: ""
 
 # -- Add additional volumes to the Dendrite Pod
 extraVolumes: []