diff --git a/src/app/zap-templates/templates/app/endpoint_config.zapt b/src/app/zap-templates/templates/app/endpoint_config.zapt
index 78fff827dca22f..76090b3a58e7ff 100644
--- a/src/app/zap-templates/templates/app/endpoint_config.zapt
+++ b/src/app/zap-templates/templates/app/endpoint_config.zapt
@@ -26,7 +26,7 @@
 
 // This is an array of EmberAfAttributeMetadata structures.
 #define GENERATED_ATTRIBUTE_COUNT {{endpoint_attribute_count}}
-#define GENERATED_ATTRIBUTES {{ endpoint_attribute_list }}
+#define GENERATED_ATTRIBUTES {{ endpoint_attribute_list order='default,id,size,type,mask'}}
 
 // clang-format off
 #define GENERATED_EVENT_COUNT {{ chip_endpoint_generated_event_count }}