diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
index 61fd850c9a..3cc06849a7 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -305,11 +305,8 @@ Settings::create(
         partialDispatch_    = GPU_PARTIAL_DISPATCH;
         numMemDependencies_ = GPU_NUM_MEM_DEPENDENCY;
 
-        //! @todo HSAIL doesn't support 64 bit atomic on 32 bit!
-        if (LP64_SWITCH(!hsail_, true)) {
-            enableExtension(ClKhrInt64BaseAtomics);
-            enableExtension(ClKhrInt64ExtendedAtomics);
-        }
+        enableExtension(ClKhrInt64BaseAtomics);
+        enableExtension(ClKhrInt64ExtendedAtomics);
         enableExtension(ClKhrImage2dFromBuffer);
         break;
     default: