diff --git a/models/workflow/workflow_mongo_accessor.go b/models/workflow/workflow_mongo_accessor.go
index f0d74e1..647d29f 100644
--- a/models/workflow/workflow_mongo_accessor.go
+++ b/models/workflow/workflow_mongo_accessor.go
@@ -100,7 +100,7 @@ func (a *workflowMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.
 		return nil, code, err
 	}
 	workflow := res.(*Workflow)
-	a.execute(workflow, false, false)       // update the workspace for the workflow
+	a.execute(workflow, false, true)        // update the workspace for the workflow
 	a.share(workflow, false, a.GetCaller()) // share the update to the peers
 	return res, code, nil
 }
@@ -119,7 +119,7 @@ func (a *workflowMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, i
 	workflow := res.(*Workflow)
 
 	a.share(workflow, false, a.GetCaller()) // share the creation to the peers
-	a.execute(workflow, false, false)       // store the workspace for the workflow
+	a.execute(workflow, false, true)        // store the workspace for the workflow
 	return res, code, nil
 }
 
@@ -214,10 +214,10 @@ func (a *workflowMongoAccessor) verifyResource(obj utils.DBObject) utils.DBObjec
 		} else if t == tools.DATA_RESOURCE {
 			access = resources.NewAccessor[*resources.DataResource](t, a.GetRequest(), func() utils.DBObject { return &resources.DataResource{} })
 		} else {
-			wf.Graph.Clear(item.Data.GetID())
+			wf.Graph.Clear(resource.GetID())
 		}
-		if error := utils.VerifyAccess(access, resource.GetID()); wf.Graph != nil && error != nil {
-			wf.Graph.Clear(item.Data.GetID())
+		if error := utils.VerifyAccess(access, resource.GetID()); error != nil {
+			wf.Graph.Clear(resource.GetID())
 		}
 	}
 	return wf