diff --git a/agent/src/main.rs b/agent/src/main.rs
index 8e97b03..aaa641c 100644
--- a/agent/src/main.rs
+++ b/agent/src/main.rs
@@ -69,14 +69,19 @@ fn main() {
             hostname: hostname.clone(),
             ip: ip.clone(),
             status: "online".to_string(),
-            cpu_percent: Some(metrics::cpu::get(&sys)),
             ..Default::default()
         };
 
+        if cfg.metrics.cpu.udp || cfg.metrics.cpu.mqtt {
+            m.cpu_percent = Some(metrics::cpu::get(&sys));
+        }
+
         let (mem_used, mem_free, mem_total) = metrics::memory::get(&sys);
-        m.memory_used = Some(mem_used);
-        m.memory_free = Some(mem_free);
-        m.memory_total = Some(mem_total);
+        if cfg.metrics.memory.udp || cfg.metrics.memory.mqtt {
+            m.memory_used = Some(mem_used);
+            m.memory_free = Some(mem_free);
+            m.memory_total = Some(mem_total);
+        }
 
         if first_medium || now.duration_since(last_medium).as_secs() >= 10 {
             networks.refresh();
diff --git a/agent/src/payload.rs b/agent/src/payload.rs
index cdb22aa..79d2f52 100644
--- a/agent/src/payload.rs
+++ b/agent/src/payload.rs
@@ -1,4 +1,3 @@
-// stub — implémenté dans la Task 3
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Default)]