diff --git a/frontend/app/shared/model/componentStructureSanitize.ts b/frontend/app/shared/model/componentStructureSanitize.ts
index 440bdb7..0902a0e 100644
--- a/frontend/app/shared/model/componentStructureSanitize.ts
+++ b/frontend/app/shared/model/componentStructureSanitize.ts
@@ -85,7 +85,10 @@ export const sanitizeCustomFields = (fields: any[]): ComponentModelCustomField[]
         }
       }
 
-      const result: ComponentModelCustomField = { name, type, required }
+      const machineContextOnly =
+        typeof valueObject?.machineContextOnly === 'boolean' ? valueObject.machineContextOnly : !!field?.machineContextOnly
+
+      const result: ComponentModelCustomField = { name, type, required, machineContextOnly }
       if (options) {
         result.options = options
       }