diff --git a/shared/source/helpers/hw_helper_pvc_and_later.inl b/shared/source/helpers/hw_helper_pvc_and_later.inl
index 3686a86820..899b391db3 100644
--- a/shared/source/helpers/hw_helper_pvc_and_later.inl
+++ b/shared/source/helpers/hw_helper_pvc_and_later.inl
@@ -36,11 +36,6 @@ bool HwHelperHw<Family>::isCooperativeDispatchSupported(const EngineGroupType en
     return true;
 }
 
-template <>
-bool HwHelperHw<Family>::isTimestampWaitSupported() const {
-    return true;
-}
-
 template <>
 bool HwHelperHw<Family>::isUpdateTaskCountFromWaitSupported() const {
     return true;
diff --git a/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp b/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp
index c807ed7455..837cdcc387 100644
--- a/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp
@@ -452,6 +452,11 @@ size_t HwHelperHw<Family>::getSipKernelMaxDbgSurfaceSize(const HardwareInfo &hwI
     return 0x2800000;
 }
 
+template <>
+bool HwHelperHw<Family>::isTimestampWaitSupported() const {
+    return true;
+}
+
 template <>
 uint64_t HwHelperHw<Family>::getPatIndex(CacheRegion cacheRegion, CachePolicy cachePolicy) const {
     /*
diff --git a/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp
index f642dcc540..13ebf5136d 100644
--- a/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp
+++ b/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp
@@ -62,4 +62,9 @@ XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenGettingISAPaddingThenC
 XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenGettingIfRevisionSpecificBinaryBuiltinIsRequiredThenTrueIsReturned) {
     auto &hwHelper = NEO::HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
     EXPECT_TRUE(hwHelper.isRevisionSpecificBinaryBuiltinRequired());
+}
+
+XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenCheckTimestampWaitSupportThenReturnTrue) {
+    auto &helper = HwHelper::get(renderCoreFamily);
+    EXPECT_TRUE(helper.isTimestampWaitSupported());
 }
\ No newline at end of file
diff --git a/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp
index bab6637d50..a214f3a84d 100644
--- a/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp
@@ -122,6 +122,11 @@ XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, WhenCheckingSipWAThenFalseIsReturned) {
     EXPECT_FALSE(HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily).isSipWANeeded(pDevice->getHardwareInfo()));
 }
 
+XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, givenHwHelperWhenCheckTimestampWaitSupportThenReturnFalse) {
+    auto &helper = HwHelper::get(renderCoreFamily);
+    EXPECT_FALSE(helper.isTimestampWaitSupported());
+}
+
 XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, givenDisablePipeControlFlagIsEnabledWhenLocalMemoryIsEnabledThenReturnTrueAndProgramPipeControl) {
     using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
     DebugManagerStateRestore restore;