diff --git a/powertrain_build/zone_controller/composition_yaml.py b/powertrain_build/zone_controller/composition_yaml.py
index c25cd71..2ddd096 100644
--- a/powertrain_build/zone_controller/composition_yaml.py
+++ b/powertrain_build/zone_controller/composition_yaml.py
@@ -567,8 +567,9 @@ class CompositionYaml(ProblemLogger):
         swcs[software_component_name]["ports"] = self._get_ports_info()
         if self.composition_spec.get("io") is not None:
             swcs[software_component_name]["io"] = self.composition_spec["io"]
+        diagnostic_info = self._get_diagnostic_info()
         if self.build_cfg.get_composition_config("includeDiagnostics") is not False:
-            swcs[software_component_name]["diagnostics"] = self._get_diagnostic_info()
+            swcs[software_component_name]["diagnostics"] = diagnostic_info
         nvm_info, nvm_data_types_tmp, static_variables = self._get_nvm_info()
         if self.build_cfg.get_composition_config("includeNvm"):
             swcs[software_component_name]["nv-needs"] = nvm_info