diff --git a/src/app/api/notary/OfficeFolderAnchorsController.ts b/src/app/api/notary/OfficeFolderAnchorsController.ts
index 3f84a5bd..8cedd895 100644
--- a/src/app/api/notary/OfficeFolderAnchorsController.ts
+++ b/src/app/api/notary/OfficeFolderAnchorsController.ts
@@ -240,7 +240,24 @@ export default class OfficeFoldersController extends ApiController {
 			}
 
 			const officeFolder = OfficeFolder.hydrate<OfficeFolder>(officeFolderFound, { strategy: "excludeAll" });
-			const folderHashes = getFolderHashes(officeFolder);
+
+			const documents = officeFolder.documents ?? [];
+
+			if (documents.length === 0) {
+				this.httpNotFoundRequest(response, "Office folder has no documents");
+				return;
+			}
+
+			const folderHashes: string[] = [];
+			documents.forEach((document: any) => {
+				const documentHydrated = Document.hydrate<Document>(document, { strategy: "excludeAll" });
+				if (documentHydrated.document_status === "VALIDATED") {
+					documentHydrated.files?.forEach((file: any) => {
+						const fileHydrated = File.hydrate<File>(file, { strategy: "excludeAll" });
+						folderHashes.push(fileHydrated.hash);
+					});
+				}
+			});
 
 			if (folderHashes.length === 0) {
 				this.httpNotFoundRequest(response, "No file hash to anchor");