diff --git a/services/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go
index c43f300dd..9ec9984db 100644
--- a/services/graph/pkg/service/v0/drives.go
+++ b/services/graph/pkg/service/v0/drives.go
@@ -223,6 +223,7 @@ func (g Graph) CreateDrive(w http.ResponseWriter, r *http.Request) {
 	}
 
 	csr := storageprovider.CreateStorageSpaceRequest{
+		Owner: us,
 		Type:  driveType,
 		Name:  spaceName,
 		Quota: getQuota(drive.Quota, g.config.Spaces.DefaultQuota),
@@ -236,10 +237,6 @@ func (g Graph) CreateDrive(w http.ResponseWriter, r *http.Request) {
 		csr.Opaque = utils.AppendPlainToOpaque(csr.Opaque, "spaceAlias", *drive.DriveAlias)
 	}
 
-	if driveType == "personal" {
-		csr.Owner = us
-	}
-
 	resp, err := client.CreateStorageSpace(r.Context(), &csr)
 	if err != nil {
 		errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, err.Error())