diff --git a/frontend/app/composables/useEntityCustomFields.ts b/frontend/app/composables/useEntityCustomFields.ts
index 4f57280..f58dc52 100644
--- a/frontend/app/composables/useEntityCustomFields.ts
+++ b/frontend/app/composables/useEntityCustomFields.ts
@@ -45,7 +45,7 @@ export function useEntityCustomFields(deps: EntityCustomFieldsDeps) {
         definitionSources.value,
         entity().customFieldValues,
       ),
-    ),
+    ).filter((field: any) => !field.machineContextOnly && !field.customField?.machineContextOnly),
   )
 
   const candidateCustomFields = computed(() =>
diff --git a/frontend/app/composables/useMachineDetailCustomFields.ts b/frontend/app/composables/useMachineDetailCustomFields.ts
index d4b8790..f60f5b8 100644
--- a/frontend/app/composables/useMachineDetailCustomFields.ts
+++ b/frontend/app/composables/useMachineDetailCustomFields.ts
@@ -140,7 +140,9 @@ export function useMachineDetailCustomFields(deps: MachineDetailCustomFieldsDeps
 
       return {
         ...normalizedPiece,
-        customFields,
+        customFields: customFields.filter((f: AnyRecord) => !f.machineContextOnly && !f.customField?.machineContextOnly),
+        contextCustomFields: piece.contextCustomFields ?? [],
+        contextCustomFieldValues: piece.contextCustomFieldValues ?? [],
         documents: piece.documents || [],
         constructeurs: constructeursList,
         constructeur: constructeursList[0] || piece.constructeur || null,
@@ -240,7 +242,9 @@ export function useMachineDetailCustomFields(deps: MachineDetailCustomFieldsDeps
 
       return {
         ...normalizedComponent,
-        customFields,
+        customFields: customFields.filter((f: AnyRecord) => !f.machineContextOnly && !f.customField?.machineContextOnly),
+        contextCustomFields: component.contextCustomFields ?? [],
+        contextCustomFieldValues: component.contextCustomFieldValues ?? [],
         pieces: piecesTransformed,
         subComponents,
         documents: component.documents || [],