diff --git a/rocclr/runtime/device/rocm/rocmemory.cpp b/rocclr/runtime/device/rocm/rocmemory.cpp
index 45b57a4ada..f99b19b740 100644
--- a/rocclr/runtime/device/rocm/rocmemory.cpp
+++ b/rocclr/runtime/device/rocm/rocmemory.cpp
@@ -589,7 +589,8 @@ void Buffer::destroy() {
   cl_mem_flags memFlags = owner()->getMemFlags();
 
   if (owner()->getSvmPtr() != nullptr) {
-    if (dev().forceFineGrain(owner())) {
+    if (dev().forceFineGrain(owner()) ||
+        dev().isFineGrainedSystem(true)) {
       memFlags |= CL_MEM_SVM_FINE_GRAIN_BUFFER;
     }
     const bool isFineGrain = memFlags & CL_MEM_SVM_FINE_GRAIN_BUFFER;
@@ -657,7 +658,8 @@ bool Buffer::create() {
   cl_mem_flags memFlags = owner()->getMemFlags();
 
   if (owner()->getSvmPtr() != nullptr) {
-    if (dev().forceFineGrain(owner())) {
+    if (dev().forceFineGrain(owner()) ||
+        dev().isFineGrainedSystem(true)) {
       memFlags |= CL_MEM_SVM_FINE_GRAIN_BUFFER;
       flags_ |= HostMemoryDirectAccess;
     }
diff --git a/rocclr/runtime/device/rocm/rocvirtual.cpp b/rocclr/runtime/device/rocm/rocvirtual.cpp
index f57797333d..9525cfc6fe 100644
--- a/rocclr/runtime/device/rocm/rocvirtual.cpp
+++ b/rocclr/runtime/device/rocm/rocvirtual.cpp
@@ -1215,7 +1215,7 @@ void VirtualGPU::submitSvmCopyMemory(amd::SvmCopyMemoryCommand& cmd) {
 
   profilingBegin(cmd);
   // no op for FGS supported device
-  if (!dev().isFineGrainedSystem()) {
+  if (!dev().isFineGrainedSystem(true)) {
     amd::Coord3D srcOrigin(0, 0, 0);
     amd::Coord3D dstOrigin(0, 0, 0);
     amd::Coord3D size(cmd.srcSize(), 1, 1);
@@ -1374,7 +1374,7 @@ void VirtualGPU::submitSvmMapMemory(amd::SvmMapMemoryCommand& cmd) {
   profilingBegin(cmd);
 
   // no op for FGS supported device
-  if (!dev().isFineGrainedSystem() &&
+  if (!dev().isFineGrainedSystem(true) &&
       !dev().forceFineGrain(cmd.getSvmMem())) {
     // Make sure we have memory for the command execution
     Memory* memory = dev().getRocMemory(cmd.getSvmMem());
@@ -1410,7 +1410,7 @@ void VirtualGPU::submitSvmUnmapMemory(amd::SvmUnmapMemoryCommand& cmd) {
   profilingBegin(cmd);
 
   // no op for FGS supported device
-  if (!dev().isFineGrainedSystem() &&
+  if (!dev().isFineGrainedSystem(true) &&
       !dev().forceFineGrain(cmd.getSvmMem())) {
     Memory* memory = dev().getRocMemory(cmd.getSvmMem());
     const device::Memory::WriteMapInfo* writeMapInfo = memory->writeMapInfo(cmd.svmPtr());
@@ -1700,7 +1700,7 @@ void VirtualGPU::submitSvmFillMemory(amd::SvmFillMemoryCommand& cmd) {
 
   amd::Memory* dstMemory = amd::MemObjMap::FindMemObj(cmd.dst());
 
-  if (!dev().isFineGrainedSystem() ||
+  if (!dev().isFineGrainedSystem(true) ||
       ((dstMemory != nullptr) &&
        !dev().forceFineGrain(dstMemory))) {
     size_t patternSize = cmd.patternSize();