diff --git a/server/build/docker-compose.common.yml b/server/build/docker-compose.common.yml
index 0c55da9bb8..5932b40a5a 100644
--- a/server/build/docker-compose.common.yml
+++ b/server/build/docker-compose.common.yml
@@ -59,14 +59,14 @@ services:
       timeout: 10s
       retries: 3
   minio:
-    image: "minio/minio:RELEASE.2019-10-11T00-38-09Z"
+    image: "minio/minio:RELEASE.2024-06-22T05-26-45Z"
     command: "server /data"
     networks:
       - mm-test
     environment:
-      MINIO_ACCESS_KEY: minioaccesskey
-      MINIO_SECRET_KEY: miniosecretkey
-      MINIO_SSE_MASTER_KEY: "my-minio-key:6368616e676520746869732070617373776f726420746f206120736563726574"
+      MINIO_ROOT_USER: minioaccesskey
+      MINIO_ROOT_PASSWORD: miniosecretkey
+      MINIO_KMS_SECRET_KEY: my-minio-key:OSMM+vkKUTCvQs9YL/CVMIMt43HFhkUpqJxTmGl6rYw=
   inbucket:
     image: "inbucket/inbucket:stable"
     restart: always
diff --git a/server/platform/shared/filestore/s3store.go b/server/platform/shared/filestore/s3store.go
index 4a94c2824f..7a152e62c7 100644
--- a/server/platform/shared/filestore/s3store.go
+++ b/server/platform/shared/filestore/s3store.go
@@ -56,6 +56,7 @@ type S3FileBackendNoBucketError struct{}
 const (
 	// This is not exported by minio. See: https://github.com/minio/minio-go/issues/1339
 	bucketNotFound = "NoSuchBucket"
+	invalidBucket  = "InvalidBucketName"
 )
 
 var (
@@ -211,7 +212,7 @@ func (b *S3FileBackend) TestConnection() error {
 		obj := <-b.client.ListObjects(ctx, b.bucket, s3.ListObjectsOptions{Prefix: b.pathPrefix})
 		if obj.Err != nil {
 			typedErr := s3.ToErrorResponse(obj.Err)
-			if typedErr.Code != bucketNotFound {
+			if typedErr.Code != bucketNotFound && typedErr.Code != invalidBucket {
 				return &S3FileBackendAuthError{DetailedError: "unable to list objects in the S3 bucket"}
 			}
 			exists = false
@@ -219,7 +220,10 @@ func (b *S3FileBackend) TestConnection() error {
 	} else {
 		exists, err = b.client.BucketExists(ctx, b.bucket)
 		if err != nil {
-			return &S3FileBackendAuthError{DetailedError: "unable to check if the S3 bucket exists"}
+			typedErr := s3.ToErrorResponse(err)
+			if typedErr.Code != bucketNotFound && typedErr.Code != invalidBucket {
+				return &S3FileBackendAuthError{DetailedError: "unable to check if the S3 bucket exists"}
+			}
 		}
 	}