diff --git a/apps/OpenSign/src/components/TreeWidget.js b/apps/OpenSign/src/components/TreeWidget.js
index b028ffb62..16326293f 100644
--- a/apps/OpenSign/src/components/TreeWidget.js
+++ b/apps/OpenSign/src/components/TreeWidget.js
@@ -472,6 +472,8 @@ const TreeWidget = (props) => {
         props.schema.data.FolderTypeField,
         props.schema.data.FolderTypeValue
       );
+      const currentUser = Parse.User.current();
+      folder.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
       if (tabList.length > 0) {
         let len = tabList.length - 1;
         folder.set(props.schema.data.ParentFolderField, {
diff --git a/apps/OpenSignServer/cloud/parsefunction/getDrive.js b/apps/OpenSignServer/cloud/parsefunction/getDrive.js
index 5c0d31a8e..1813bc069 100644
--- a/apps/OpenSignServer/cloud/parsefunction/getDrive.js
+++ b/apps/OpenSignServer/cloud/parsefunction/getDrive.js
@@ -16,9 +16,9 @@ export default async function getDrive(request) {
     if (userId) {
       let url;
       if (docId) {
-        url = `${classUrl}?where={"Folder":{"__type":"Pointer","className":"contracts_Document","objectId":"${docId}"},"$or":[{"CreatedBy":{"$exists":false}},{"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"}}]}&include=ExtUserPtr,Signers,Folder`;
+        url = `${classUrl}?where={"Folder":{"__type":"Pointer","className":"contracts_Document","objectId":"${docId}"},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"}}&include=ExtUserPtr,Signers,Folder`;
       } else {
-        url = `${classUrl}?where={"Folder":{"$exists":false},"$or":[{"CreatedBy":{"$exists":false}},{"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"}}]}&include=ExtUserPtr,Signers`;
+        url = `${classUrl}?where={"Folder":{"$exists":false},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"}}&include=ExtUserPtr,Signers`;
       }
       try {
         const res = await axios.get(url, {
diff --git a/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js b/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js
index db0c94425..e821f3616 100644
--- a/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js
+++ b/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js
@@ -25,8 +25,15 @@ function PdfFile() {
   });
   const [docId, setDocId] = useState();
   const [handleError, setHandleError] = useState();
-
   const [folderName, setFolderName] = useState([]);
+  const currentUser =
+    localStorage.getItem(
+      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
+    ) &&
+    localStorage.getItem(
+      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
+    );
+  const jsonCurrentUser = JSON.parse(currentUser);
 
   useEffect(() => {
     if (docId) {
@@ -151,22 +158,32 @@ function PdfFile() {
       setIsFolderLoader(true);
 
       const getParentObjId = folderName[folderName.length - 1];
-      const isParentId = getParentObjId && getParentObjId.objectId;
+      const parentId = getParentObjId && getParentObjId.objectId;
       let data;
-      if (isParentId) {
+      if (parentId) {
         data = {
           Name: newFolderName,
           Type: "Folder",
           Folder: {
             __type: "Pointer",
             className: `${localStorage.getItem("_appName")}_Document`,
-            objectId: isParentId
+            objectId: parentId
+          },
+          CreatedBy: {
+            __type: "Pointer",
+            className: "_User",
+            objectId: jsonCurrentUser.objectId
           }
         };
       } else {
         data = {
           Name: newFolderName,
-          Type: "Folder"
+          Type: "Folder",
+          CreatedBy: {
+            __type: "Pointer",
+            className: "_User",
+            objectId: jsonCurrentUser.objectId
+          }
         };
       }