diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
index bef145c1e..fc70c7c84 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
@@ -688,7 +688,7 @@ export class WorkspaceQueryRunnerService {
       return await workspaceDataSource?.transaction(
         async (transactionManager) => {
           await transactionManager.query(`
-          SET search_path TO ${this.workspaceDataSourceService.getSchemaName(
+          SET LOCAL search_path TO ${this.workspaceDataSourceService.getSchemaName(
             workspaceId,
           )};
         `);
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts
index bd5a78ee1..00727eaba 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service.ts
@@ -74,12 +74,11 @@ export class WorkspaceMigrationRunnerService {
     await queryRunner.connect();
     await queryRunner.startTransaction();
 
-    // Reset search_path to force to postgres to prefix migrations in the correct schema due to postgres driver behavior
-    await queryRunner.query('SET search_path TO public');
-
     const schemaName =
       this.workspaceDataSourceService.getSchemaName(workspaceId);
 
+    await queryRunner.query(`SET LOCAL search_path TO ${schemaName}`);
+
     try {
       // Loop over each migration and create or update the table
       for (const migration of flattenedPendingMigrations) {