diff --git a/projects/roctracer/src/core/roctracer.cpp b/projects/roctracer/src/core/roctracer.cpp
index 155892c6dd..e93179de56 100644
--- a/projects/roctracer/src/core/roctracer.cpp
+++ b/projects/roctracer/src/core/roctracer.cpp
@@ -1026,11 +1026,13 @@ PUBLIC_API roctracer_status_t roctracer_set_properties(
       roctracer::hsa_support::async_copy_callback_arg = ops_properties->async_copy_callback_arg;
       roctracer::hsa_support::output_prefix = ops_properties->output_prefix;
 
+#if 0
       // HSA dispatches intercepting
       rocprofiler::SaveHsaApi(table);
       rocprofiler::ProxyQueue::InitFactory();
       rocprofiler::ProxyQueue::HsaIntercept(table);
       rocprofiler::InterceptQueue::HsaIntercept(table);
+#endif
 
       // HSA async-copy tracing
       hsa_status_t status = hsa_amd_profiling_async_copy_enable(true);
diff --git a/projects/roctracer/test/tool/tracer_tool.cpp b/projects/roctracer/test/tool/tracer_tool.cpp
index 99b87c1135..71da132baa 100644
--- a/projects/roctracer/test/tool/tracer_tool.cpp
+++ b/projects/roctracer/test/tool/tracer_tool.cpp
@@ -553,18 +553,10 @@ extern "C" PUBLIC_API bool OnLoad(HsaApiTable* table, uint64_t runtime_version,
     }
 
     // HSA/HIP domains enabling
-    if (std::string(trace_domain).find("hsa-api") != std::string::npos) {
+    if (std::string(trace_domain).find("hsa") != std::string::npos) {
       trace_hsa_api = true;
-    }
-    if (std::string(trace_domain).find("hsa-act") != std::string::npos) {
       trace_hsa_activity = true;
     }
-    if ((trace_hsa_activity == false) && (trace_hsa_api == false)) {
-      if (std::string(trace_domain).find("hsa") != std::string::npos) {
-        trace_hsa_api = true;
-        trace_hsa_activity = true;
-      }
-    }
     if (std::string(trace_domain).find("hip") != std::string::npos) {
       trace_hip_api = true;
       trace_hip_activity = true;