diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
index f4aa0fcb0a..8e588ea17c 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
@@ -1314,6 +1314,7 @@ bool Device::init() {
   info.flags.enableSvmMode = true;
 #endif
 #endif
+  info.flags.supportRgpTraces = true;
   info.pSettingsPath = "OCL";
   info.maxSvmSize = static_cast<Pal::gpusize>(OCL_SET_SVM_SIZE * Mi);
 
diff --git a/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp b/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp
index c40b0946b9..bf3f6581f7 100644
--- a/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palgpuopen.cpp
@@ -197,13 +197,7 @@ void RgpCaptureMgr::Finalize() {
   // picked as the target of an eventual VkDevice, this check is imperfect.
   // In mixed-GPU situations where an unsupported GPU is picked for tracing,
   // trace capture will fail with an error.
-  bool hw_support_tracing = false;
-
-  if ((rgp_server_->EnableTraces() == DevDriver::Result::Success)) {
-    if (GpuSupportsTracing(device_.properties(), device_.settings())) {
-      hw_support_tracing = true;
-    }
-  }
+  bool hw_support_tracing = GpuSupportsTracing(device_.properties(), device_.settings());
 
   if (hw_support_tracing == false) {
     rgp_server_->DisableTraces();