diff --git a/thunk_proxy/thunk_proxy.h b/thunk_proxy/thunk_proxy.h
index fe5537bdb5..96de1caa10 100644
--- a/thunk_proxy/thunk_proxy.h
+++ b/thunk_proxy/thunk_proxy.h
@@ -55,7 +55,7 @@ typedef struct {
   int stepping;
   bool is_dgpu;
   char product_name[MAX_PATH];
-  const char *uuid;
+  uint64_t uuid;
   AsicFamilyType family;
   uint32_t device_id;
   uint32_t wavefront_size;
diff --git a/wddm/device.h b/wddm/device.h
index 2aa751b662..30878923e9 100644
--- a/wddm/device.h
+++ b/wddm/device.h
@@ -83,7 +83,7 @@ public:
   int Stepping() { return device_info_.stepping; }
   bool IsDgpu() { return device_info_.is_dgpu; }
   const char *ProductName() { return device_info_.product_name; }
-  const char *Uuid() { return device_info_.uuid; }
+  uint64_t Uuid() { return device_info_.uuid; }
   thunk_proxy::AsicFamilyType GfxFamily() { return device_info_.family; }
   uint32_t DeviceId() { return device_info_.device_id; }
   uint32_t WavefrontSize() { return device_info_.wavefront_size; }