diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata-related-records.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata-related-records.service.ts
index a7c47e395..680fca7a0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata-related-records.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata-related-records.service.ts
@@ -71,7 +71,12 @@ export class FieldMetadataRelatedRecordsService {
       if (view.viewGroups.length === 0) {
         continue;
       }
+      const valuesToDelete = deleted.map((option) => option.value);
 
+      await viewGroupRepository.delete({
+        fieldMetadataId: newFieldMetadata.id,
+        fieldValue: In(valuesToDelete),
+      });
       const maxPosition = this.getMaxPosition(view.viewGroups);
 
       const viewGroupsToCreate = created.map((option, index) =>
@@ -103,13 +108,6 @@ export class FieldMetadataRelatedRecordsService {
         );
       }
 
-      const valuesToDelete = deleted.map((option) => option.value);
-
-      await viewGroupRepository.delete({
-        fieldMetadataId: newFieldMetadata.id,
-        fieldValue: In(valuesToDelete),
-      });
-
       await this.syncNoValueViewGroup(
         newFieldMetadata,
         view,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service.ts
index 2e1aaa5c4..a5a5b85e2 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-runner/services/workspace-migration-enum.service.ts
@@ -139,7 +139,13 @@ export class WorkspaceMigrationEnumService {
     }
 
     if (allEnumValues?.includes(value)) {
-      return value;
+      const isDestinationOfRename = renamedEnumValues?.some(
+        (enumVal) => enumVal.to === value,
+      );
+
+      if (!isDestinationOfRename) {
+        return value;
+      }
     }
 
     if (isDefined(defaultValueFallback)) {