diff --git a/models/workspace/shared/shared_workspace_mongo_accessor.go b/models/workspace/shared/shared_workspace_mongo_accessor.go
index b51226d..9e30131 100644
--- a/models/workspace/shared/shared_workspace_mongo_accessor.go
+++ b/models/workspace/shared/shared_workspace_mongo_accessor.go
@@ -40,7 +40,7 @@ func (wfa *sharedWorkspaceMongoAccessor) sharedWorkspace(shared *SharedWorkspace
 		eld := eldest.(*SharedWorkspace)
 		if eld.Workspaces != nil {
 			for _, v := range eld.Workspaces {
-				accessor.UpdateOne(&workspace.Workspace{Shared: false}, v)
+				accessor.UpdateOne(&workspace.Workspace{Shared: shared.UUID}, v)
 				if wfa.Caller != nil || wfa.Caller.URLS == nil || wfa.Caller.URLS[utils.WORKSPACE.String()] == nil {
 					continue
 				}
@@ -56,7 +56,7 @@ func (wfa *sharedWorkspaceMongoAccessor) sharedWorkspace(shared *SharedWorkspace
 	}
 	if shared.Workspaces != nil {
 		for _, v := range shared.Workspaces {
-			workspace, code, _ := accessor.UpdateOne(&workspace.Workspace{Shared: true}, v)
+			workspace, code, _ := accessor.UpdateOne(&workspace.Workspace{Shared: shared.UUID}, v)
 			if wfa.Caller != nil || wfa.Caller.URLS == nil || wfa.Caller.URLS[utils.WORKSPACE.String()] == nil {
 				continue
 			}
diff --git a/models/workspace/workspace.go b/models/workspace/workspace.go
index b118a97..6522baa 100644
--- a/models/workspace/workspace.go
+++ b/models/workspace/workspace.go
@@ -12,9 +12,9 @@ import (
 type Workspace struct {
 	utils.AbstractObject
 	resources.ResourceSet
-	IsContextual bool `json:"is_contextual" bson:"is_contextual" default:"false"`
-	Active       bool `json:"active" bson:"active" default:"false"`
-	Shared       bool `json:"shared" bson:"shared" default:"false"`
+	IsContextual bool   `json:"is_contextual" bson:"is_contextual" default:"false"`
+	Active       bool   `json:"active" bson:"active" default:"false"`
+	Shared       string `json:"shared" bson:"shared" default:"false"`
 }
 
 func (ao *Workspace) GetID() string {