diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-migrate-email-fields-to-emails.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-migrate-email-fields-to-emails.command.ts
index 3841adc67..87ff3e5b0 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-migrate-email-fields-to-emails.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-30/0-30-migrate-email-fields-to-emails.command.ts
@@ -93,6 +93,12 @@ export class MigrateEmailFieldsToEmailsCommand extends ActiveWorkspacesCommandRu
       }
 
       try {
+        await this.migratePersonEmailFieldToEmailsField(
+          workspaceId,
+          workspaceQueryRunner,
+          dataSourceMetadata,
+        );
+
         const customFieldsWithEmailType =
           await this.fieldMetadataRepository.find({
             where: {
@@ -102,12 +108,6 @@ export class MigrateEmailFieldsToEmailsCommand extends ActiveWorkspacesCommandRu
             },
           });
 
-        await this.migratePersonEmailFieldToEmailsField(
-          workspaceId,
-          workspaceQueryRunner,
-          dataSourceMetadata,
-        );
-
         for (const customFieldWithEmailType of customFieldsWithEmailType) {
           const objectMetadata = await this.objectMetadataRepository.findOne({
             where: { id: customFieldWithEmailType.objectMetadataId },