diff --git a/rust/headless-client/src/device_id.rs b/rust/headless-client/src/device_id.rs
index a1c20f2a1..9aa71321a 100644
--- a/rust/headless-client/src/device_id.rs
+++ b/rust/headless-client/src/device_id.rs
@@ -36,9 +36,18 @@ fn device_serial() -> Option<String> {
     Some(serial)
 }
 
+fn device_uuid() -> Option<String> {
+    let data = smbioslib::table_load_from_device().ok()?;
+
+    let uuid = data.find_map(|sys_info: smbioslib::SMBiosSystemInformation| sys_info.uuid());
+
+    uuid?.to_string().into()
+}
+
 pub fn device_info() -> phoenix_channel::DeviceInfo {
     phoenix_channel::DeviceInfo {
         device_serial: device_serial(),
+        device_uuid: device_uuid(),
         ..Default::default()
     }
 }