diff --git a/bitnami/minio/Chart.yaml b/bitnami/minio/Chart.yaml
index 9e0edb321..41bccc8c0 100644
--- a/bitnami/minio/Chart.yaml
+++ b/bitnami/minio/Chart.yaml
@@ -25,4 +25,4 @@ name: minio
 sources:
   - https://github.com/bitnami/bitnami-docker-minio
   - https://min.io
-version: 7.1.7
+version: 7.1.8
diff --git a/bitnami/minio/templates/distributed/statefulset.yaml b/bitnami/minio/templates/distributed/statefulset.yaml
index 9f6904a95..16b2ac1b5 100644
--- a/bitnami/minio/templates/distributed/statefulset.yaml
+++ b/bitnami/minio/templates/distributed/statefulset.yaml
@@ -237,14 +237,14 @@ spec:
             - name: minio-certs
               mountPath: {{ default "/certs" .Values.tls.mountPath }}
             {{- end }}
-            {{- if and .Values.persistence.enabled (gt $drivesPerNode 1) }}
+            {{- if gt $drivesPerNode 1 }}
             {{- range $diskId := until $drivesPerNode }}
             - name: data-{{ $diskId }}
-              mountPath: {{  $mountPath }}-{{ $diskId }}
+              mountPath: {{ $mountPath }}-{{ $diskId }}
             {{- end }}
             {{- else }}
             - name: data
-              mountPath: {{  $mountPath }}
+              mountPath: {{ $mountPath }}
             {{- end }}
             {{- if .Values.extraVolumeMounts }}
             {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
@@ -273,7 +273,12 @@ spec:
         {{- if .Values.extraVolumes }}
         {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
         {{- end }}
-  {{- if not .Values.persistence.enabled }}
+  {{- if and (not .Values.persistence.enabled) (gt $drivesPerNode 1) }}
+  {{- range $diskId := until $drivesPerNode }}
+        - name: data-{{ $diskId }}
+          emptyDir: {}
+  {{- end }}
+  {{- else if not .Values.persistence.enabled }}
         - name: data
           emptyDir: {}
   {{- else }}