diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-add-context-to-actor-composite-type.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-add-context-to-actor-composite-type.ts
index 7912a4189..fd1217492 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-add-context-to-actor-composite-type.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-add-context-to-actor-composite-type.ts
@@ -97,12 +97,6 @@ export class AddContextToActorCompositeTypeCommand extends ActiveWorkspacesComma
           field.object.nameSingular,
         );
 
-      if (!dryRun) {
-        await this.workspaceMetadataVersionService.incrementMetadataVersion(
-          workspaceId,
-        );
-      }
-
       if (!dryRun) {
         const rowsToUpdate = await fieldRepository.update(
           {
@@ -124,6 +118,12 @@ export class AddContextToActorCompositeTypeCommand extends ActiveWorkspacesComma
         );
       }
     }
+
+    if (!dryRun) {
+      await this.workspaceMetadataVersionService.incrementMetadataVersion(
+        workspaceId,
+      );
+    }
   }
 
   private async addContextColumn(
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type.ts
index 3ea641bd7..91722d51b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type.ts
@@ -1,9 +1,9 @@
 import { ConnectedAccountProvider, FieldMetadataType } from 'twenty-shared';
+import { v4 } from 'uuid';
 
-import {
-  CompositeProperty,
-  CompositeType,
-} from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { FieldMetadataDefaultOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
 
 export enum FieldActorSource {
   EMAIL = 'EMAIL',
@@ -23,12 +23,16 @@ export const actorCompositeType: CompositeType = {
       type: FieldMetadataType.SELECT,
       hidden: false,
       isRequired: true,
-      options: Object.keys(FieldActorSource).map((key, index) => ({
-        label: `${FieldActorSource[key].toLowerCase()}`,
-        value: key,
-        position: index,
-      })),
-    } as CompositeProperty<FieldMetadataType.SELECT>,
+      options: Object.keys(FieldActorSource).map(
+        (key, index) =>
+          ({
+            id: v4(),
+            label: `${FieldActorSource[key].toLowerCase()}`,
+            value: key,
+            position: index,
+          }) satisfies Required<FieldMetadataDefaultOption>,
+      ),
+    },
     {
       name: 'workspaceMemberId',
       type: FieldMetadataType.UUID,