diff --git a/app/composables/useComponentCreate.ts b/app/composables/useComponentCreate.ts
index d9fb328..f2aad01 100644
--- a/app/composables/useComponentCreate.ts
+++ b/app/composables/useComponentCreate.ts
@@ -323,7 +323,7 @@ export function useComponentCreate() {
         await _saveCustomFieldValues(
           'composant',
           createdComponent.id,
-          [createdComponent?.typeComposant?.customFields],
+          [createdComponent?.typeComposant?.structure?.customFields],
           { customFieldInputs, upsertCustomFieldValue, updateCustomFieldValue, toast },
         )
         if (selectedDocuments.value.length && result.data?.id) {
diff --git a/app/composables/useComponentEdit.ts b/app/composables/useComponentEdit.ts
index 6beed60..9906274 100644
--- a/app/composables/useComponentEdit.ts
+++ b/app/composables/useComponentEdit.ts
@@ -399,7 +399,7 @@ export function useComponentEdit(componentId: string) {
           'composant',
           updatedComponent.id,
           [
-            updatedComponent?.typeComposant?.customFields,
+            updatedComponent?.typeComposant?.structure?.customFields,
           ],
           { customFieldInputs, upsertCustomFieldValue, updateCustomFieldValue, toast },
         )
diff --git a/app/composables/usePieceEdit.ts b/app/composables/usePieceEdit.ts
index ce4c62a..99226c4 100644
--- a/app/composables/usePieceEdit.ts
+++ b/app/composables/usePieceEdit.ts
@@ -408,7 +408,7 @@ export function usePieceEdit(pieceId: string) {
           'piece',
           updatedPiece.id,
           [
-            updatedPiece?.typePiece?.pieceCustomFields,
+            updatedPiece?.typePiece?.structure?.customFields,
           ],
           { customFieldInputs, upsertCustomFieldValue, updateCustomFieldValue, toast },
         )
diff --git a/app/pages/pieces/create.vue b/app/pages/pieces/create.vue
index f2c5616..1994170 100644
--- a/app/pages/pieces/create.vue
+++ b/app/pages/pieces/create.vue
@@ -444,7 +444,7 @@ const submitCreation = async () => {
         'piece',
         createdPiece.id,
         [
-          createdPiece?.typePiece?.pieceCustomFields,
+          createdPiece?.typePiece?.structure?.customFields,
         ],
         { customFieldInputs, upsertCustomFieldValue, updateCustomFieldValue, toast },
       )
diff --git a/app/pages/product/[id]/edit.vue b/app/pages/product/[id]/edit.vue
index 8f19d7e..9d3affd 100644
--- a/app/pages/product/[id]/edit.vue
+++ b/app/pages/product/[id]/edit.vue
@@ -502,7 +502,7 @@ const submitEdition = async () => {
       const failedFields = await _saveCustomFieldValues(
         'product',
         result.data.id,
-        [],
+        [result.data?.typeProduct?.structure?.customFields],
         { customFieldInputs, upsertCustomFieldValue, updateCustomFieldValue, toast },
       )
       if (failedFields.length) {