diff --git a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh
index eaa4dc4d5a217..d51332d1e3daf 100755
--- a/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh
+++ b/bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh
@@ -53,11 +53,11 @@ else
         exit 1
     fi
 
+    # Create default buckets
+    minio_create_default_buckets
+
     if is_boolean_yes "$MINIO_DISTRIBUTED_MODE_ENABLED"; then
         # Wait for other clients (distribute mode)
         sleep 5
     fi
-
-    # Create default buckets
-    minio_create_default_buckets
 fi