diff --git a/rocclr/device/rocm/rocdevice.cpp b/rocclr/device/rocm/rocdevice.cpp
index 49616b8523..f9d7743d58 100644
--- a/rocclr/device/rocm/rocdevice.cpp
+++ b/rocclr/device/rocm/rocdevice.cpp
@@ -1577,11 +1577,8 @@ bool Device::populateOCLDeviceConstants() {
     info_.pcieDeviceId_ = pciDeviceId_;
     info_.cooperativeGroups_ = settings().enableCoopGroups_;
     info_.cooperativeMultiDeviceGroups_ = settings().enableCoopMultiDeviceGroups_;
-
-    // TODO: Update this to use HSA API when it is ready. For now limiting this to gfx9
-    info_.aqlBarrierValue_ = (isa().versionMajor() == 9 && isa().versionMinor() == 0 &&
-                             (isa().versionStepping() == 0 || isa().versionStepping() == 4 ||
-                              isa().versionStepping() == 8 || isa().versionStepping() == 10));
+    // Enable StreamWrite and StreamWait for all devices
+    info_.aqlBarrierValue_ = true;
   }
 
   info_.maxPipePacketSize_ = info_.maxMemAllocSize_;