diff --git a/opencl/test/unit_test/device/windows/device_windows_tests.cpp b/opencl/test/unit_test/device/windows/device_windows_tests.cpp
index 18977bb7d3..c38365e402 100644
--- a/opencl/test/unit_test/device/windows/device_windows_tests.cpp
+++ b/opencl/test/unit_test/device/windows/device_windows_tests.cpp
@@ -6,6 +6,9 @@
  */
 
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/test/common/mocks/mock_execution_environment.h"
+#include "shared/test/common/mocks/mock_ostime.h"
+#include "shared/test/common/mocks/mock_ostime_win.h"
 #include "shared/test/common/mocks/mock_wddm.h"
 #include "shared/test/common/test_macros/test.h"
 
@@ -15,6 +18,25 @@ using namespace NEO;
 
 namespace ULT {
 
+typedef ::testing::Test MockOSTimeWinTest;
+
+TEST_F(MockOSTimeWinTest, whenCreatingTimerThenResolutionIsSetCorrectly) {
+    MockExecutionEnvironment executionEnvironment;
+    RootDeviceEnvironment rootDeviceEnvironment(executionEnvironment);
+    auto wddmMock = new WddmMock(rootDeviceEnvironment);
+    auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
+
+    wddmMock->init();
+
+    wddmMock->timestampFrequency = 1000;
+
+    std::unique_ptr<MockOSTimeWin> timeWin(new MockOSTimeWin(wddmMock));
+
+    double res = 0.0;
+    res = timeWin->getDynamicDeviceTimerResolution(device->getHardwareInfo());
+    EXPECT_EQ(res, 1e+06);
+}
+
 TEST(GetDeviceInfo, givenClDeviceWhenGettingDeviceInfoThenCorrectAdapterLuidIsReturned) {
     auto clDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
     clDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface);
diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h
index ecc2d57959..6ec2021d58 100644
--- a/shared/source/os_interface/hw_info_config.h
+++ b/shared/source/os_interface/hw_info_config.h
@@ -60,6 +60,7 @@ class HwInfoConfig {
     virtual uint64_t getSharedSystemMemCapabilities(const HardwareInfo *hwInfo) = 0;
     virtual void getKernelExtendedProperties(uint32_t *fp16, uint32_t *fp32, uint32_t *fp64) = 0;
     virtual std::vector<int32_t> getKernelSupportedThreadArbitrationPolicies() = 0;
+    virtual void convertTimestampsFromOaToCsDomain(uint64_t &timestampData) = 0;
     virtual uint32_t getDeviceMemoryMaxClkRate(const HardwareInfo &hwInfo, const OSInterface *osIface, uint32_t subDeviceIndex) = 0;
     virtual uint64_t getDeviceMemoryPhysicalSizeInBytes(const OSInterface *osIface, uint32_t subDeviceIndex) = 0;
     virtual uint64_t getDeviceMemoryMaxBandWidthInBytesPerSecond(const HardwareInfo &hwInfo, const OSInterface *osIface, uint32_t subDeviceIndex) = 0;
@@ -195,6 +196,7 @@ class HwInfoConfigHw : public HwInfoConfig {
     uint64_t getSharedSystemMemCapabilities(const HardwareInfo *hwInfo) override;
     void getKernelExtendedProperties(uint32_t *fp16, uint32_t *fp32, uint32_t *fp64) override;
     std::vector<int32_t> getKernelSupportedThreadArbitrationPolicies() override;
+    void convertTimestampsFromOaToCsDomain(uint64_t &timestampData) override;
     uint32_t getDeviceMemoryMaxClkRate(const HardwareInfo &hwInfo, const OSInterface *osIface, uint32_t subDeviceIndex) override;
     uint64_t getDeviceMemoryPhysicalSizeInBytes(const OSInterface *osIface, uint32_t subDeviceIndex) override;
     uint64_t getDeviceMemoryMaxBandWidthInBytesPerSecond(const HardwareInfo &hwInfo, const OSInterface *osIface, uint32_t subDeviceIndex) override;
diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl
index 9984e25249..4248c45aa4 100644
--- a/shared/source/os_interface/hw_info_config.inl
+++ b/shared/source/os_interface/hw_info_config.inl
@@ -42,6 +42,9 @@ std::vector<int32_t> HwInfoConfigHw<gfxProduct>::getKernelSupportedThreadArbitra
     return PreambleHelper<GfxFamily>::getSupportedThreadArbitrationPolicies();
 }
 
+template <PRODUCT_FAMILY gfxProduct>
+void HwInfoConfigHw<gfxProduct>::convertTimestampsFromOaToCsDomain(uint64_t &timestampData){};
+
 template <PRODUCT_FAMILY gfxProduct>
 void HwInfoConfigHw<gfxProduct>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {}
 
diff --git a/shared/source/os_interface/windows/device_time_gpu_cpu_drm_or_wddm.cpp b/shared/source/os_interface/windows/device_time_gpu_cpu_drm_or_wddm.cpp
index 7f9b09c425..c0b00b424e 100644
--- a/shared/source/os_interface/windows/device_time_gpu_cpu_drm_or_wddm.cpp
+++ b/shared/source/os_interface/windows/device_time_gpu_cpu_drm_or_wddm.cpp
@@ -21,7 +21,9 @@ bool DeviceTimeWddm::getCpuGpuTime(TimeStampData *pGpuCpuTime, OSTime *osTime) {
     TimeStampDataHeader escapeInfo = {};
 
     if (runEscape(wddm, escapeInfo)) {
-        convertTimestampsFromOaToCsDomain(escapeInfo.m_Data.m_Out.gpuPerfTicks, escapeInfo.m_Data.m_Out.gpuPerfFreq, static_cast<uint64_t>(wddm->getTimestampFrequency()));
+        auto productFamily = wddm->getRootDeviceEnvironment().getHardwareInfo()->platform.eProductFamily;
+        auto *hwInfoConfig = HwInfoConfig::get(productFamily);
+        hwInfoConfig->convertTimestampsFromOaToCsDomain(escapeInfo.m_Data.m_Out.gpuPerfTicks);
 
         osTime->getCpuTime(&pGpuCpuTime->CPUTimeinNS);
         pGpuCpuTime->GPUTimeStamp = (unsigned long long)escapeInfo.m_Data.m_Out.gpuPerfTicks;
diff --git a/shared/source/os_interface/windows/device_time_gpu_cpu_wddm.cpp b/shared/source/os_interface/windows/device_time_gpu_cpu_wddm.cpp
index dcd278e52d..bf8db852b2 100644
--- a/shared/source/os_interface/windows/device_time_gpu_cpu_wddm.cpp
+++ b/shared/source/os_interface/windows/device_time_gpu_cpu_wddm.cpp
@@ -21,7 +21,9 @@ bool DeviceTimeWddm::getCpuGpuTime(TimeStampData *pGpuCpuTime, OSTime *osTime) {
     TimeStampDataHeader escapeInfo = {};
 
     if (runEscape(wddm, escapeInfo)) {
-        convertTimestampsFromOaToCsDomain(escapeInfo.m_Data.m_Out.gpuPerfTicks, escapeInfo.m_Data.m_Out.gpuPerfFreq, static_cast<uint64_t>(wddm->getTimestampFrequency()));
+        auto productFamily = wddm->getRootDeviceEnvironment().getHardwareInfo()->platform.eProductFamily;
+        auto *hwInfoConfig = HwInfoConfig::get(productFamily);
+        hwInfoConfig->convertTimestampsFromOaToCsDomain(escapeInfo.m_Data.m_Out.gpuPerfTicks);
         double cpuNanoseconds = escapeInfo.m_Data.m_Out.cpuPerfTicks *
                                 (1000000000.0 / escapeInfo.m_Data.m_Out.cpuPerfFreq);
 
diff --git a/shared/source/os_interface/windows/device_time_wddm.cpp b/shared/source/os_interface/windows/device_time_wddm.cpp
index d4c5ca25cb..13f2b3c20f 100644
--- a/shared/source/os_interface/windows/device_time_wddm.cpp
+++ b/shared/source/os_interface/windows/device_time_wddm.cpp
@@ -70,10 +70,4 @@ uint64_t DeviceTimeWddm::getDynamicDeviceTimerClock(HardwareInfo const &hwInfo)
     return retVal;
 }
 
-void DeviceTimeWddm::convertTimestampsFromOaToCsDomain(uint64_t &timestampData, uint64_t freqOA, uint64_t freqCS) {
-    if (freqCS > 0) {
-        auto freqRatio = freqOA / freqCS;
-        timestampData /= freqRatio;
-    }
-};
 } // namespace NEO
diff --git a/shared/source/os_interface/windows/device_time_wddm.h b/shared/source/os_interface/windows/device_time_wddm.h
index 99efbf5d28..cb5f02b00f 100644
--- a/shared/source/os_interface/windows/device_time_wddm.h
+++ b/shared/source/os_interface/windows/device_time_wddm.h
@@ -24,7 +24,6 @@ class DeviceTimeWddm : public DeviceTime {
 
   protected:
     MOCKABLE_VIRTUAL bool runEscape(Wddm *wddm, TimeStampDataHeader &escapeInfo);
-    void convertTimestampsFromOaToCsDomain(uint64_t &timestampData, uint64_t freqOA, uint64_t freqCS);
     Wddm *wddm = nullptr;
 };
 
diff --git a/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl b/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl
index 7aecd16690..64a1444309 100644
--- a/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl
+++ b/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl
@@ -169,6 +169,11 @@ uint32_t HwInfoConfigHw<gfxProduct>::computeMaxNeededSubSliceSpace(const Hardwar
     return maxSubSlice;
 }
 
+template <>
+void HwInfoConfigHw<gfxProduct>::convertTimestampsFromOaToCsDomain(uint64_t &timestampData) {
+    timestampData >>= 1;
+}
+
 template <>
 bool HwInfoConfigHw<gfxProduct>::isFlushTaskAllowed() const {
     return true;
diff --git a/shared/test/common/mocks/mock_hw_info_config.cpp b/shared/test/common/mocks/mock_hw_info_config.cpp
index ab04511289..3752baa5c8 100644
--- a/shared/test/common/mocks/mock_hw_info_config.cpp
+++ b/shared/test/common/mocks/mock_hw_info_config.cpp
@@ -18,6 +18,10 @@ template <>
 void HwInfoConfigHw<IGFX_UNKNOWN>::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) {
 }
 
+template <>
+void HwInfoConfigHw<IGFX_UNKNOWN>::convertTimestampsFromOaToCsDomain(uint64_t &timestampData) {
+}
+
 template <>
 uint32_t HwInfoConfigHw<IGFX_UNKNOWN>::getMaxThreadsForWorkgroupInDSSOrSS(const HardwareInfo &hwInfo, uint32_t maxNumEUsPerSubSlice, uint32_t maxNumEUsPerDualSubSlice) const {
     return 0;
diff --git a/shared/test/common/mocks/mock_ostime_win.h b/shared/test/common/mocks/mock_ostime_win.h
index 9d27eb5f93..5e83589eaa 100644
--- a/shared/test/common/mocks/mock_ostime_win.h
+++ b/shared/test/common/mocks/mock_ostime_win.h
@@ -10,16 +10,10 @@
 #include "shared/source/os_interface/windows/os_time_win.h"
 
 namespace NEO {
-struct MockDeviceTimeWddm : DeviceTimeWddm {
-    using DeviceTimeWddm::convertTimestampsFromOaToCsDomain;
-};
 class MockOSTimeWin : public OSTimeWin {
   public:
     MockOSTimeWin(Wddm *wddm) {
         this->deviceTime = std::make_unique<DeviceTimeWddm>(wddm);
     }
-    void convertTimestampsFromOaToCsDomain(uint64_t &timestampData, uint64_t freqOA, uint64_t freqCS) {
-        static_cast<MockDeviceTimeWddm *>(this->deviceTime.get())->convertTimestampsFromOaToCsDomain(timestampData, freqOA, freqCS);
-    }
 };
 } // namespace NEO
diff --git a/shared/test/unit_test/device/windows/neo_device_windows_tests.cpp b/shared/test/unit_test/device/windows/neo_device_windows_tests.cpp
index 50a5186564..c4a3044c1e 100644
--- a/shared/test/unit_test/device/windows/neo_device_windows_tests.cpp
+++ b/shared/test/unit_test/device/windows/neo_device_windows_tests.cpp
@@ -9,8 +9,6 @@
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/common/mocks/mock_execution_environment.h"
-#include "shared/test/common/mocks/mock_ostime_win.h"
 #include "shared/test/common/mocks/mock_wddm.h"
 #include "shared/test/common/test_macros/test.h"
 
@@ -57,45 +55,3 @@ TEST_F(DeviceTest, GivenDeviceWhenGetAdapterMaskThenMaskIsSet) {
 
     EXPECT_EQ(nodeMask, 1u);
 }
-
-typedef ::testing::Test MockOSTimeWinTest;
-
-TEST_F(MockOSTimeWinTest, whenCreatingTimerThenResolutionIsSetCorrectly) {
-    MockExecutionEnvironment executionEnvironment;
-    RootDeviceEnvironment rootDeviceEnvironment(executionEnvironment);
-    auto wddmMock = new WddmMock(rootDeviceEnvironment);
-    auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
-
-    wddmMock->init();
-
-    wddmMock->timestampFrequency = 1000;
-
-    std::unique_ptr<MockOSTimeWin> timeWin(new MockOSTimeWin(wddmMock));
-
-    double res = 0.0;
-    res = timeWin->getDynamicDeviceTimerResolution(device->getHardwareInfo());
-    EXPECT_EQ(res, 1e+06);
-}
-
-TEST_F(MockOSTimeWinTest, whenConvertingTimestampsToCsDomainThenTimestampDataAreSetCorrectly) {
-    MockExecutionEnvironment executionEnvironment;
-    RootDeviceEnvironment rootDeviceEnvironment(executionEnvironment);
-    auto wddmMock = new WddmMock(rootDeviceEnvironment);
-    auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
-    wddmMock->init();
-    std::unique_ptr<MockOSTimeWin> timeWin(new MockOSTimeWin(wddmMock));
-    uint64_t timestampData = 0x1234;
-    uint64_t freqOA = 1;
-    uint64_t freqCS = 0;
-    auto expectedGpuTicksWhenEqualOne = timestampData;
-    timeWin->convertTimestampsFromOaToCsDomain(timestampData, freqOA, freqCS);
-    EXPECT_EQ(expectedGpuTicksWhenEqualOne, timestampData);
-    freqCS = 1;
-    timeWin->convertTimestampsFromOaToCsDomain(timestampData, freqOA, freqCS);
-    EXPECT_EQ(expectedGpuTicksWhenEqualOne, timestampData);
-    freqOA = 2;
-    uint64_t ratio = freqOA / freqCS;
-    auto expectedGpuTicksWhenRatioBiggerThanOne = timestampData / ratio;
-    timeWin->convertTimestampsFromOaToCsDomain(timestampData, freqOA, freqCS);
-    EXPECT_EQ(expectedGpuTicksWhenRatioBiggerThanOne, timestampData);
-}
\ No newline at end of file
diff --git a/shared/test/unit_test/os_interface/hw_info_config_tests.cpp b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp
index 788878dac3..6d9f57700d 100644
--- a/shared/test/unit_test/os_interface/hw_info_config_tests.cpp
+++ b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp
@@ -196,6 +196,14 @@ TEST_F(HwInfoConfigTest, givenInvalidHwInfoWhenParsingHwInfoConfigThenErrorIsRet
     EXPECT_FALSE(success);
 }
 
+HWTEST_F(HwInfoConfigTest, whenConvertingTimestampsToCsDomainThenNothingIsChanged) {
+    auto hwInfoConfig = HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
+    uint64_t timestampData = 0x1234;
+    uint64_t initialData = timestampData;
+    hwInfoConfig->convertTimestampsFromOaToCsDomain(timestampData);
+    EXPECT_EQ(initialData, timestampData);
+}
+
 HWTEST_F(HwInfoConfigTest, whenOverrideGfxPartitionLayoutForWslThenReturnFalse) {
     auto hwInfoConfig = HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
     EXPECT_FALSE(hwInfoConfig->overrideGfxPartitionLayoutForWsl());
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
index 79676e12c0..c8071d5a99 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
@@ -19,6 +19,16 @@ using namespace NEO;
 
 using HwInfoConfigTestDg2 = ::testing::Test;
 
+DG2TEST_F(HwInfoConfigTestDg2, whenConvertingTimestampsToCsDomainThenGpuTicksAreShifted) {
+    auto hwInfoConfig = HwInfoConfig::get(defaultHwInfo->platform.eProductFamily);
+    uint64_t gpuTicks = 0x12345u;
+
+    auto expectedGpuTicks = gpuTicks >> 1;
+
+    hwInfoConfig->convertTimestampsFromOaToCsDomain(gpuTicks);
+    EXPECT_EQ(expectedGpuTicks, gpuTicks);
+}
+
 DG2TEST_F(HwInfoConfigTestDg2, givenDg2ConfigWhenSetupHardwareInfoBaseThenGtSystemInfoIsCorrect) {
     HardwareInfo hwInfo = *defaultHwInfo;
     GT_SYSTEM_INFO &gtSystemInfo = hwInfo.gtSystemInfo;