diff --git a/api/js/etemplate/et2_extension_customfields.ts b/api/js/etemplate/et2_extension_customfields.ts
index 0103c23d73..ce53bcddd5 100644
--- a/api/js/etemplate/et2_extension_customfields.ts
+++ b/api/js/etemplate/et2_extension_customfields.ts
@@ -369,7 +369,7 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
 			for(let key in data)
 			{
 				// Don't overwrite fields / customfields with global values
-				if(global_data[key] && key !== 'fields' && !(key == "customfields" && typeof data.customfields != undefined))
+				if (global_data[key] && key !== 'fields' && (key !== "customfields" || !Object.keys(data.customfields).length))
 				{
 					data[key] = {...data[key], ...global_data[key]};
 				}