diff --git a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useGenerateCombinedFindManyRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useGenerateCombinedFindManyRecordsQuery.ts
index 3019f9bd2fe..8d07c42bf65 100644
--- a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useGenerateCombinedFindManyRecordsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useGenerateCombinedFindManyRecordsQuery.ts
@@ -77,14 +77,6 @@ export const useGenerateCombinedFindManyRecordsQuery = ({
       )
       .join(', ');
 
-  const limitPerMetadataItemArray =
-    queryOperationSignatureWithObjectMetadataItemArray
-      .map(
-        ({ objectMetadataItem }) =>
-          `$limit${capitalize(objectMetadataItem.nameSingular)}: Int`,
-      )
-      .join(', ');
-
   if (isEmpty(queryOperationSignatureWithObjectMetadataItemArray)) {
     return null;
   }
@@ -93,8 +85,7 @@ export const useGenerateCombinedFindManyRecordsQuery = ({
     query CombinedFindManyRecords(
       ${filterPerMetadataItemArray}, 
       ${orderByPerMetadataItemArray}, 
-      ${cursorFilteringPerMetadataItemArray}, 
-      ${limitPerMetadataItemArray}
+      ${cursorFilteringPerMetadataItemArray},
     ) {
       ${queryOperationSignatureWithObjectMetadataItemArray
         .map(
diff --git a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/usePerformCombinedFindManyRecords.ts b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/usePerformCombinedFindManyRecords.ts
index 6427baa4119..74fd16bfb3f 100644
--- a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/usePerformCombinedFindManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/usePerformCombinedFindManyRecords.ts
@@ -51,13 +51,6 @@ export const usePerformCombinedFindManyRecords = () => {
       )
       .join(', ');
 
-    const limitPerMetadataItemArray = operationSignatures
-      .map(
-        ({ objectNameSingular }) =>
-          `$limit${capitalize(objectNameSingular)}: Int`,
-      )
-      .join(', ');
-
     const queryOperationSignatureWithObjectMetadataItemArray =
       operationSignatures.map((operationSignature) => {
         const objectMetadataItem = objectMetadataItemsValue.find(
@@ -80,7 +73,6 @@ export const usePerformCombinedFindManyRecords = () => {
       ${filterPerMetadataItemArray}, 
       ${orderByPerMetadataItemArray}, 
       ${cursorFilteringPerMetadataItemArray}, 
-      ${limitPerMetadataItemArray}
     ) {
       ${queryOperationSignatureWithObjectMetadataItemArray
         .map(
diff --git a/packages/twenty-front/src/modules/object-record/multiple-objects/utils/getCombinedFindManyRecordsQueryFilteringPart.ts b/packages/twenty-front/src/modules/object-record/multiple-objects/utils/getCombinedFindManyRecordsQueryFilteringPart.ts
index 70ed17fdc3a..3f021d53e52 100644
--- a/packages/twenty-front/src/modules/object-record/multiple-objects/utils/getCombinedFindManyRecordsQueryFilteringPart.ts
+++ b/packages/twenty-front/src/modules/object-record/multiple-objects/utils/getCombinedFindManyRecordsQueryFilteringPart.ts
@@ -10,6 +10,5 @@ export const getCombinedFindManyRecordsQueryFilteringPart = (
   after: $after${capitalize(objectMetadataItem.nameSingular)},
   before: $before${capitalize(objectMetadataItem.nameSingular)},
   first: $first${capitalize(objectMetadataItem.nameSingular)},
-  last: $last${capitalize(objectMetadataItem.nameSingular)},
-  limit: $limit${capitalize(objectMetadataItem.nameSingular)})`;
+  last: $last${capitalize(objectMetadataItem.nameSingular)})`;
 };
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/object-metadata-create-gql-input-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/object-metadata-create-gql-input-type.generator.ts
index 2458f5b9247..6e6b638e29e 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/object-metadata-create-gql-input-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/object-metadata-create-gql-input-type.generator.ts
@@ -127,9 +127,14 @@ export class ObjectMetadataCreateGqlInputTypeGenerator {
       throw new Error(message);
     }
 
+    const modifiedEnumType = this.typeMapperService.applyTypeOptions(
+      enumType,
+      typeOptions,
+    );
+
     return {
       [fieldMetadata.name]: {
-        type: enumType,
+        type: modifiedEnumType,
         description: fieldMetadata.description,
       },
     };
@@ -156,9 +161,14 @@ export class ObjectMetadataCreateGqlInputTypeGenerator {
       throw new Error(message);
     }
 
+    const modifiedCompositeType = this.typeMapperService.applyTypeOptions(
+      compositeType,
+      typeOptions,
+    );
+
     return {
       [fieldMetadata.name]: {
-        type: compositeType,
+        type: modifiedCompositeType,
         description: fieldMetadata.description,
       },
     };
@@ -183,9 +193,14 @@ export class ObjectMetadataCreateGqlInputTypeGenerator {
       throw new Error(message);
     }
 
+    const modifiedType = this.typeMapperService.applyTypeOptions(
+      type,
+      typeOptions,
+    );
+
     return {
       [fieldMetadata.name]: {
-        type,
+        type: modifiedType,
         description: fieldMetadata.description,
       },
     };
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/update-input/object-metadata-update-gql-input-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/update-input/object-metadata-update-gql-input-type.generator.ts
index f1af9bde645..35bb08e441b 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/update-input/object-metadata-update-gql-input-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/update-input/object-metadata-update-gql-input-type.generator.ts
@@ -142,9 +142,15 @@ export class ObjectMetadataUpdateGqlInputTypeGenerator {
             throw new Error(message);
           }
         }
+
+        const modifiedType = this.typeMapperService.applyTypeOptions(
+          type,
+          typeOptions,
+        );
+
         generatedFields = {
           [fieldMetadata.name]: {
-            type,
+            type: modifiedType,
             description: fieldMetadata.description,
           },
         };