diff --git a/src/lib/services/clients.service.ts b/src/lib/services/clients.service.ts
index c060c2df..f99627a4 100644
--- a/src/lib/services/clients.service.ts
+++ b/src/lib/services/clients.service.ts
@@ -533,7 +533,7 @@ export async function updateClient(
 
   if (data.fullName !== undefined) {
     await syncEntityFolderName(portId, 'client', id, meta.userId).catch((err) => {
-      logger.error({ err, clientId: id }, 'Failed to sync client folder name');
+      logger.warn({ err, clientId: id }, 'Failed to sync client folder name');
     });
   }
 
diff --git a/src/lib/services/companies.service.ts b/src/lib/services/companies.service.ts
index a0b88eb9..6bf69230 100644
--- a/src/lib/services/companies.service.ts
+++ b/src/lib/services/companies.service.ts
@@ -185,7 +185,7 @@ export async function updateCompany(
 
   if (data.name !== undefined) {
     await syncEntityFolderName(portId, 'company', id, meta.userId).catch((err) => {
-      logger.error({ err, companyId: id }, 'Failed to sync company folder name');
+      logger.warn({ err, companyId: id }, 'Failed to sync company folder name');
     });
   }
 
diff --git a/src/lib/services/document-folders.service.ts b/src/lib/services/document-folders.service.ts
index 14483edc..1988b882 100644
--- a/src/lib/services/document-folders.service.ts
+++ b/src/lib/services/document-folders.service.ts
@@ -561,7 +561,7 @@ export async function syncEntityFolderName(
       const [updated] = await db
         .update(documentFolders)
         .set({ name: candidate, updatedAt: new Date() })
-        .where(eq(documentFolders.id, folder.id))
+        .where(and(eq(documentFolders.id, folder.id), eq(documentFolders.portId, portId)))
         .returning();
       if (updated) return;
     } catch (err) {
diff --git a/src/lib/services/yachts.service.ts b/src/lib/services/yachts.service.ts
index f6001f1c..c6cd2f0b 100644
--- a/src/lib/services/yachts.service.ts
+++ b/src/lib/services/yachts.service.ts
@@ -165,7 +165,7 @@ export async function updateYacht(
 
   if (data.name !== undefined) {
     await syncEntityFolderName(portId, 'yacht', id, meta.userId).catch((err) => {
-      logger.error({ err, yachtId: id }, 'Failed to sync yacht folder name');
+      logger.warn({ err, yachtId: id }, 'Failed to sync yacht folder name');
     });
   }