diff --git a/opencl/source/helpers/hardware_commands_helper_xehp_plus.inl b/opencl/source/helpers/hardware_commands_helper_xehp_plus.inl
index 049e7a35af..1931250310 100644
--- a/opencl/source/helpers/hardware_commands_helper_xehp_plus.inl
+++ b/opencl/source/helpers/hardware_commands_helper_xehp_plus.inl
@@ -168,4 +168,9 @@ void HardwareCommandsHelper<GfxFamily>::programCacheFlushAfterWalkerCommand(Line
     }
 }
 
+template <typename GfxFamily>
+void HardwareCommandsHelper<GfxFamily>::setGrfInfo(INTERFACE_DESCRIPTOR_DATA *pInterfaceDescriptor, const Kernel &kernel,
+                                                   const size_t &sizeCrossThreadData, const size_t &sizePerThreadData) {
+}
+
 } // namespace NEO
diff --git a/opencl/source/xe_hp_core/hardware_commands_helper_xe_hp_core.cpp b/opencl/source/xe_hp_core/hardware_commands_helper_xe_hp_core.cpp
index 58329c9a1b..5cb5ebf6ba 100644
--- a/opencl/source/xe_hp_core/hardware_commands_helper_xe_hp_core.cpp
+++ b/opencl/source/xe_hp_core/hardware_commands_helper_xe_hp_core.cpp
@@ -14,10 +14,5 @@
 
 namespace NEO {
 
-template <>
-void HardwareCommandsHelper<XeHpFamily>::setGrfInfo(INTERFACE_DESCRIPTOR_DATA *pInterfaceDescriptor, const Kernel &kernel,
-                                                    const size_t &sizeCrossThreadData, const size_t &sizePerThreadData) {
-}
-
 template struct HardwareCommandsHelper<XeHpFamily>;
 } // namespace NEO