diff --git a/src/core/intercept_queue.h b/src/core/intercept_queue.h
index 52225108ac..f24bf5b7d0 100644
--- a/src/core/intercept_queue.h
+++ b/src/core/intercept_queue.h
@@ -138,8 +138,8 @@ class InterceptQueue {
         data.submit.packet = (void*)packet;
         data.submit.kernel_name =
           (GetHeaderType(packet) == HSA_PACKET_TYPE_KERNEL_DISPATCH) ? GetKernelName(dispatch_packet) : NULL;
-        submit_callback_fun_(ROCPROFILER_HSA_CB_ID_SUBMIT, &data, submit_callback_arg_);
         data.submit.queue = obj->queue_;
+        submit_callback_fun_(ROCPROFILER_HSA_CB_ID_SUBMIT, &data, submit_callback_arg_);
       }
     }