diff --git a/apps/OpenSign/src/components/shared/fields/CreateFolder.js b/apps/OpenSign/src/components/shared/fields/CreateFolder.js
index 55d18ef82..f9ffcc9b1 100644
--- a/apps/OpenSign/src/components/shared/fields/CreateFolder.js
+++ b/apps/OpenSign/src/components/shared/fields/CreateFolder.js
@@ -27,10 +27,12 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
         FolderQuery.equalTo("Folder", folderPtr);
         FolderQuery.equalTo("Type", "Folder");
         FolderQuery.notEqualTo("IsArchive", true);
+        FolderQuery.equalTo("CreatedBy", Parse.User.current());
       } else {
         FolderQuery.doesNotExist("Folder");
         FolderQuery.equalTo("Type", "Folder");
         FolderQuery.notEqualTo("IsArchive", true);
+        FolderQuery.equalTo("CreatedBy", Parse.User.current());
       }
 
       const res = await FolderQuery.find();
diff --git a/apps/OpenSign/src/components/shared/fields/FolderModal.js b/apps/OpenSign/src/components/shared/fields/FolderModal.js
index 857e59951..a318ab96b 100644
--- a/apps/OpenSign/src/components/shared/fields/FolderModal.js
+++ b/apps/OpenSign/src/components/shared/fields/FolderModal.js
@@ -26,10 +26,12 @@ const FolderModal = (props) => {
         FolderQuery.equalTo("Folder", folderPtr);
         FolderQuery.descending("Type");
         FolderQuery.notEqualTo("IsArchive", true);
+        FolderQuery.equalTo("CreatedBy", Parse.User.current());
       } else {
         FolderQuery.doesNotExist("Folder");
         FolderQuery.descending("Type");
         FolderQuery.notEqualTo("IsArchive", true);
+        FolderQuery.equalTo("CreatedBy", Parse.User.current());
       }
 
       const res = await FolderQuery.find();
diff --git a/apps/OpenSign/src/components/shared/fields/SelectFolder.js b/apps/OpenSign/src/components/shared/fields/SelectFolder.js
index d98f44012..91ec14426 100644
--- a/apps/OpenSign/src/components/shared/fields/SelectFolder.js
+++ b/apps/OpenSign/src/components/shared/fields/SelectFolder.js
@@ -46,10 +46,12 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
         FolderQuery.equalTo("Folder", folderPtr);
         FolderQuery.notEqualTo("IsArchive", true);
         FolderQuery.descending("Type");
+        FolderQuery.equalTo("CreatedBy", Parse.User.current());
       } else {
         FolderQuery.doesNotExist("Folder");
         FolderQuery.notEqualTo("IsArchive", true);
         FolderQuery.descending("Type");
+        FolderQuery.equalTo("CreatedBy", Parse.User.current());
       }
 
       const res = await FolderQuery.find();