diff --git a/src/core/session/att/att.cpp b/src/core/session/att/att.cpp
index a19e99e449..d695c87802 100644
--- a/src/core/session/att/att.cpp
+++ b/src/core/session/att/att.cpp
@@ -210,7 +210,7 @@ bool AttTracer::AsyncSignalHandlerATT(hsa_signal_value_t /* signal */, void* dat
   {
     rocprofiler_record_att_tracer_t record{};
     record.kernel_id = rocprofiler_kernel_id_t{pending.kernel_descriptor};
-    record.gpu_id = rocprofiler_agent_id_t{(uint64_t)queue_info_session->agent.handle};
+    record.gpu_id = rocprofiler_agent_id_t{(uint64_t)queue_info_session->gpu_index};
     record.kernel_properties = pending.kernel_properties;
     record.thread_id = rocprofiler_thread_id_t{pending.thread_id};
     record.queue_idx = rocprofiler_queue_index_t{pending.queue_index};
diff --git a/src/core/session/att/continuous.cpp b/src/core/session/att/continuous.cpp
index 10763a916a..e2aad9a942 100644
--- a/src/core/session/att/continuous.cpp
+++ b/src/core/session/att/continuous.cpp
@@ -192,7 +192,11 @@ void AttTracer::InsertPacketStop(
       rsignal.session_id_snapshot,
       queue.GetQueueID(),
       rsignal.writer_id,
-      interrupt_signal
+      interrupt_signal,
+      HSASupport_Singleton::GetInstance()
+                        .GetHSAAgentInfo(agent_handle)
+                        .GetDeviceInfo()
+                        .getNumaNode()
   });
 
   //codeobj_record::stop_capture(rocprofiler_record_id_t{rsignal.record_id});
diff --git a/src/core/session/att/singlekernel.cpp b/src/core/session/att/singlekernel.cpp
index ff7603e3a5..8e8638c495 100644
--- a/src/core/session/att/singlekernel.cpp
+++ b/src/core/session/att/singlekernel.cpp
@@ -217,7 +217,11 @@ bool AttTracer::ATTSingleWriteInterceptor(
       session_id_,
       queue_info.GetQueueID(),
       writer_id,
-      interrupt_signal
+      interrupt_signal,
+      HSASupport_Singleton::GetInstance()
+                        .GetHSAAgentInfo(queue_info.GetGPUAgent().handle)
+                        .GetDeviceInfo()
+                        .getNumaNode()
     });
   }
   /* Write the transformed packets to the hardware queue.  */