diff --git a/rocclr/runtime/device/gpu/gpusettings.cpp b/rocclr/runtime/device/gpu/gpusettings.cpp
index a3e362dcf6..1592b9f8ba 100644
--- a/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -227,7 +227,7 @@ Settings::create(
         ciPlus_ = true;
         sdmaProfiling_ = true;
         hsail_ = GPU_HSAIL_ENABLE;
-        threadTraceEnable_ = AMD_THREAD_TRACE_ENABLE;
+        threadTraceEnable_ = calAttr.isSVMFineGrainSystem ? false : AMD_THREAD_TRACE_ENABLE;
         // Fall through to SI ...
     case CAL_TARGET_PITCAIRN:
     case CAL_TARGET_CAPEVERDE: