diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
index 580976e51a..b8efa502e4 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -417,7 +417,7 @@ Settings::create(
         disablePersistent_ = true;
     }
 
-    if (calAttr.priSupport) {
+    if (calAttr.priSupport && ENABLE_PLATFORM_ATOMICS) {
         svmAtomics_ = true;
     }
 
diff --git a/projects/clr/rocclr/runtime/utils/flags.hpp b/projects/clr/rocclr/runtime/utils/flags.hpp
index 8bea06f379..cd6a0ede56 100644
--- a/projects/clr/rocclr/runtime/utils/flags.hpp
+++ b/projects/clr/rocclr/runtime/utils/flags.hpp
@@ -160,8 +160,8 @@ release(bool, HSA_LOCAL_MEMORY_ENABLE, false,                                 \
         "Enable HSA device local memory usage")                               \
 release(bool, HSA_ENABLE_ATOMICS_32B, false,                                  \
         "1 = Enable SVM atomics in 32 bits (HSA backend-only). Any other value keeps then disabled.") \
-release_on_stg(bool, GPU_ENABLE_HIGH_PERFORMANCE_STATE, false,                \
-        "Enable high performance state")
+release(bool, ENABLE_PLATFORM_ATOMICS, false,                \
+        "Enable platform atomics")
 
 namespace amd {