diff --git a/opencl/source/command_queue/hardware_interface.h b/opencl/source/command_queue/hardware_interface.h
index eab444dd0a..e32c1161bc 100644
--- a/opencl/source/command_queue/hardware_interface.h
+++ b/opencl/source/command_queue/hardware_interface.h
@@ -91,8 +91,6 @@ class HardwareInterface {
         Vec3<size_t> &numberOfWorkgroups,
         Vec3<size_t> &startOfWorkgroups);
 
-    static void programAdditionalFieldsForWalker(WALKER_TYPE<GfxFamily> &walkerCmd);
-
     static WALKER_TYPE<GfxFamily> *allocateWalkerSpace(LinearStream &commandStream,
                                                        const Kernel &kernel);
 
diff --git a/opencl/source/command_queue/hardware_interface_base.inl b/opencl/source/command_queue/hardware_interface_base.inl
index e1e6dd7f25..082cf19580 100644
--- a/opencl/source/command_queue/hardware_interface_base.inl
+++ b/opencl/source/command_queue/hardware_interface_base.inl
@@ -228,5 +228,4 @@ void HardwareInterface<GfxFamily>::obtainIndirectHeaps(CommandQueue &commandQueu
         ssh = &getIndirectHeap<GfxFamily, IndirectHeap::SURFACE_STATE>(commandQueue, multiDispatchInfo);
     }
 }
-
 } // namespace NEO
diff --git a/opencl/source/command_queue/hardware_interface_bdw_plus.inl b/opencl/source/command_queue/hardware_interface_bdw_plus.inl
index 7257406c2c..6c5971aa72 100644
--- a/opencl/source/command_queue/hardware_interface_bdw_plus.inl
+++ b/opencl/source/command_queue/hardware_interface_bdw_plus.inl
@@ -139,10 +139,6 @@ inline void HardwareInterface<GfxFamily>::programWalker(
                                                            false, false,
                                                            *kernel.getKernelInfo().patchInfo.threadPayload, 0u);
 
-    programAdditionalFieldsForWalker(*walkerCmd);
+    EncodeDispatchKernel<GfxFamily>::encodeAdditionalWalkerFields(commandQueue.getDevice().getHardwareInfo(), *walkerCmd);
 }
-
-template <typename GfxFamily>
-void HardwareInterface<GfxFamily>::programAdditionalFieldsForWalker(WALKER_TYPE<GfxFamily> &walkerCmd) {}
-
 } // namespace NEO
diff --git a/shared/source/command_container/command_encoder.h b/shared/source/command_container/command_encoder.h
index 883db15207..447fb16f29 100644
--- a/shared/source/command_container/command_encoder.h
+++ b/shared/source/command_container/command_encoder.h
@@ -26,6 +26,7 @@ struct EncodeDispatchKernel {
 
     static void encode(CommandContainer &container,
                        const void *pThreadGroupDimensions, bool isIndirect, bool isPredicate, DispatchKernelEncoderI *dispatchInterface, uint64_t eventAddress, Device *device, PreemptionMode preemptionMode);
+    static void encodeAdditionalWalkerFields(const HardwareInfo &hwInfo, WALKER_TYPE &walkerCmd);
 
     static void *getInterfaceDescriptor(CommandContainer &container, uint32_t &iddOffset);
 
diff --git a/shared/source/command_container/command_encoder_base.inl b/shared/source/command_container/command_encoder_base.inl
index 8cf6f9f700..f67aeb0725 100644
--- a/shared/source/command_container/command_encoder_base.inl
+++ b/shared/source/command_container/command_encoder_base.inl
@@ -284,6 +284,9 @@ size_t EncodeMiFlushDW<GfxFamily>::getMiFlushDwWaSize() {
     return 0;
 }
 
+template <typename GfxFamily>
+void EncodeDispatchKernel<GfxFamily>::encodeAdditionalWalkerFields(const HardwareInfo &hwInfo, WALKER_TYPE &walkerCmd) {}
+
 template <typename GfxFamily>
 inline void EncodeWA<GfxFamily>::encodeAdditionalPipelineSelect(Device &device, LinearStream &stream, bool is3DPipeline) {}