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 dac63bbd54..5db71bda67 100644
--- a/opencl/test/unit_test/memory_manager/storage_info_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/storage_info_tests.cpp
@@ -439,7 +439,7 @@ TEST_F(MultiDeviceStorageInfoTest, givenGpuTimestampAllocationWhenUsingSingleTil
                                     singleTileMask};
     auto storageInfo = memoryManager->createStorageInfoFromProperties(properties);
     EXPECT_EQ(singleTileMask, storageInfo.memoryBanks);
-    EXPECT_FALSE(storageInfo.cloningOfPageTables);
+    EXPECT_TRUE(storageInfo.cloningOfPageTables);
     EXPECT_FALSE(storageInfo.tileInstanced);
     EXPECT_EQ(singleTileMask, storageInfo.pageTablesVisibility);
 }
diff --git a/shared/source/memory_manager/definitions/storage_info.cpp b/shared/source/memory_manager/definitions/storage_info.cpp
index f21aff2e87..ba5642ae41 100644
--- a/shared/source/memory_manager/definitions/storage_info.cpp
+++ b/shared/source/memory_manager/definitions/storage_info.cpp
@@ -102,11 +102,9 @@ StorageInfo MemoryManager::createStorageInfoFromProperties(const AllocationPrope
         }
         break;
     case AllocationType::GPU_TIMESTAMP_DEVICE_BUFFER:
-        if (properties.flags.multiOsContextCapable) {
-            storageInfo.cloningOfPageTables = true;
-        } else {
+        storageInfo.cloningOfPageTables = true;
+        if (!properties.flags.multiOsContextCapable) {
             storageInfo.pageTablesVisibility = preferredTile;
-            storageInfo.cloningOfPageTables = false;
         }
         break;
     case AllocationType::BUFFER: