diff --git a/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp b/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp
index 6b7ad26158..6ba086727c 100644
--- a/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp
+++ b/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp
@@ -36,7 +36,7 @@ bool HardwareCommandsHelper<TGLLPFamily>::isPipeControlWArequired(const Hardware
 
 template <>
 bool HardwareCommandsHelper<TGLLPFamily>::isPipeControlPriorToPipelineSelectWArequired(const HardwareInfo &hwInfo) {
-    return (Gen12LPHelpers::pipeControlWaRequired(hwInfo.platform.eProductFamily)) && (hwInfo.platform.usRevId == REVISION_A0);
+    return HardwareCommandsHelper<TGLLPFamily>::isPipeControlWArequired(hwInfo);
 }
 
 template struct HardwareCommandsHelper<TGLLPFamily>;
diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
index 41feab2173..cce8d4b07f 100644
--- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
+++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
@@ -260,7 +260,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, CommandEncodeStatesTest, givenCleanHeapsAndSlmNotCha
     GenCmdList commands;
     CmdParse<FamilyType>::parseCommandBuffer(commands, ptrOffset(cmdContainer->getCommandStream()->getCpuBase(), 0), cmdContainer->getCommandStream()->getUsed());
 
-    if (HardwareCommandsHelper<TGLLPFamily>::isPipeControlPriorToPipelineSelectWArequired(pDevice->getHardwareInfo())) {
+    if (HardwareCommandsHelper<FamilyType>::isPipeControlPriorToPipelineSelectWArequired(pDevice->getHardwareInfo())) {
         auto itorPC = findAll<PIPE_CONTROL *>(commands.begin(), commands.end());
         EXPECT_EQ(2u, itorPC.size());
     } else {