diff --git a/opencl/test/unit_test/memory_manager/storage_info_tests.cpp b/opencl/test/unit_test/memory_manager/storage_info_tests.cpp
index 5c02e0b7a2..f002d3cf3f 100644
--- a/opencl/test/unit_test/memory_manager/storage_info_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/storage_info_tests.cpp
@@ -421,7 +421,12 @@ TEST_F(MultiDeviceStorageInfoTest,
                                     false,
                                     allTilesMask};
     auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
-    EXPECT_EQ(allTilesMask, storageInfo.memoryBanks);
+
+    auto leastOccupiedBank = memoryManager->localMemoryUsageBankSelector[properties.rootDeviceIndex]->getLeastOccupiedBank(properties.subDevicesBitfield);
+    DeviceBitfield allocationMask;
+    allocationMask.set(leastOccupiedBank);
+
+    EXPECT_EQ(allocationMask, storageInfo.memoryBanks);
     EXPECT_TRUE(storageInfo.cloningOfPageTables);
     EXPECT_FALSE(storageInfo.tileInstanced);
     EXPECT_EQ(allTilesMask, storageInfo.pageTablesVisibility);
diff --git a/shared/source/memory_manager/definitions/storage_info.cpp b/shared/source/memory_manager/definitions/storage_info.cpp
index e21e3eb7ec..b819f0d752 100644
--- a/shared/source/memory_manager/definitions/storage_info.cpp
+++ b/shared/source/memory_manager/definitions/storage_info.cpp
@@ -93,10 +93,8 @@ StorageInfo MemoryManager::createStorageInfoFromProperties(const AllocationPrope
         break;
     case GraphicsAllocation::AllocationType::GPU_TIMESTAMP_DEVICE_BUFFER:
         if (properties.flags.multiOsContextCapable) {
-            storageInfo.memoryBanks = allTilesValue;
             storageInfo.cloningOfPageTables = true;
         } else {
-            storageInfo.memoryBanks = preferredTile;
             storageInfo.pageTablesVisibility = preferredTile;
             storageInfo.cloningOfPageTables = false;
         }