diff --git a/api/handler/put.go b/api/handler/put.go
index 009dbb08..3e99501a 100644
--- a/api/handler/put.go
+++ b/api/handler/put.go
@@ -1011,18 +1011,12 @@ func checkBucketName(bucketName string) error {
 		return apierr.GetAPIError(apierr.ErrInvalidBucketName)
 	}
 
-	labels := strings.Split(bucketName, ".")
-	for _, label := range labels {
-		if len(label) == 0 {
+	for i, r := range bucketName {
+		if r == '.' || (!isAlphaNum(r) && r != '-') {
 			return apierr.GetAPIError(apierr.ErrInvalidBucketName)
 		}
-		for i, r := range label {
-			if !isAlphaNum(r) && r != '-' {
-				return apierr.GetAPIError(apierr.ErrInvalidBucketName)
-			}
-			if (i == 0 || i == len(label)-1) && r == '-' {
-				return apierr.GetAPIError(apierr.ErrInvalidBucketName)
-			}
+		if (i == 0 || i == len(bucketName)-1) && r == '-' {
+			return apierr.GetAPIError(apierr.ErrInvalidBucketName)
 		}
 	}
 
diff --git a/api/handler/put_test.go b/api/handler/put_test.go
index 07c59e67..235a5e58 100644
--- a/api/handler/put_test.go
+++ b/api/handler/put_test.go
@@ -42,10 +42,10 @@ func TestCheckBucketName(t *testing.T) {
 	}{
 		{name: "bucket"},
 		{name: "2bucket"},
-		{name: "buc.ket"},
 		{name: "buc-ket"},
 		{name: "abc"},
 		{name: "63aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
+		{name: "buc.ket", err: true},
 		{name: "buc.-ket", err: true},
 		{name: "bucket.", err: true},
 		{name: ".bucket", err: true},