diff --git a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl
index 768870b692..8b54fd9550 100644
--- a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl
+++ b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl
@@ -6,7 +6,6 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
-#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
@@ -101,11 +100,11 @@ GEN12LPTEST_F(Gen12LpCoherencyRequirements, GivenSharedHandlesWhenGettingCmdSize
 
     overrideCoherencyRequest(false, false, true);
     auto retSize = csr->getCmdSizeForComputeMode();
-    EXPECT_EQ(cmdsSize, retSize);
+    EXPECT_EQ(0u, retSize);
 
     overrideCoherencyRequest(false, true, true);
     retSize = csr->getCmdSizeForComputeMode();
-    EXPECT_EQ(cmdsSize, retSize);
+    EXPECT_EQ(0u, retSize);
 
     overrideCoherencyRequest(true, true, true);
     retSize = csr->getCmdSizeForComputeMode();
@@ -257,7 +256,7 @@ GEN12LPTEST_F(Gen12LpCoherencyRequirements, givenCoherencyRequirementWithoutShar
     csr->getMemoryManager()->freeGraphicsMemory(graphicAlloc);
 }
 
-GEN12LPTEST_F(Gen12LpCoherencyRequirements, givenCoherencyRequirementWithSharedHandlesWhenFlushTaskCalledThenAlwaysProgramCmds) {
+GEN12LPTEST_F(Gen12LpCoherencyRequirements, givenSharedHandlesWhenFlushTaskCalledThenProgramPipeControlWhenNeeded) {
     auto startOffset = csr->commandStream.getUsed();
     auto graphicsAlloc = csr->getMemoryManager()->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize});
     IndirectHeap stream(graphicsAlloc);
@@ -289,15 +288,11 @@ GEN12LPTEST_F(Gen12LpCoherencyRequirements, givenCoherencyRequirementWithSharedH
                 EXPECT_NE(nullptr, pc);
             }
         }
-        EXPECT_TRUE(foundOne);
+        EXPECT_EQ(valueChanged, foundOne);
     };
 
     flushTaskAndFindCmds(false, true);  // first time
     flushTaskAndFindCmds(false, false); // not changed
-    flushTaskAndFindCmds(true, true);   // changed
-    flushTaskAndFindCmds(true, false);  // not changed
-    flushTaskAndFindCmds(false, true);  // changed
-    flushTaskAndFindCmds(false, false); // not changed
 
     csr->getMemoryManager()->freeGraphicsMemory(graphicsAlloc);
 }
diff --git a/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl
index 69e8dec894..2d24f7c829 100644
--- a/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl
+++ b/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl
@@ -20,17 +20,17 @@ HWTEST2_F(ComputeModeRequirements, givenCsrRequestFlagsWithSharedHandlesWhenComm
     overrideComputeModeRequest<FamilyType>(false, false, true);
 
     auto retSize = getCsrHw<FamilyType>()->getCmdSizeForComputeMode();
-    EXPECT_EQ(cmdsSize, retSize);
+    EXPECT_EQ(0u, retSize);
     getCsrHw<FamilyType>()->programComputeMode(stream, flags, *defaultHwInfo);
-    EXPECT_EQ(cmdsSize, stream.getUsed());
+    EXPECT_EQ(0u, stream.getUsed());
 
     stream.replaceBuffer(buff, 1024);
     overrideComputeModeRequest<FamilyType>(false, true, true);
 
     retSize = getCsrHw<FamilyType>()->getCmdSizeForComputeMode();
-    EXPECT_EQ(cmdsSize, retSize);
+    EXPECT_EQ(0u, retSize);
     getCsrHw<FamilyType>()->programComputeMode(stream, flags, *defaultHwInfo);
-    EXPECT_EQ(cmdsSize, stream.getUsed());
+    EXPECT_EQ(0u, stream.getUsed());
 
     stream.replaceBuffer(buff, 1024);
     overrideComputeModeRequest<FamilyType>(true, true, true);
diff --git a/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp
index c3b24da524..2fb2f490f0 100644
--- a/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp
+++ b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp
@@ -39,7 +39,7 @@ size_t CommandStreamReceiverHw<Family>::getCmdSizeForComputeMode() {
     }
 
     size_t size = 0;
-    if (this->streamProperties.stateComputeMode.isDirty() || csrSizeRequestFlags.hasSharedHandles || csrSizeRequestFlags.numGrfRequiredChanged) {
+    if (this->streamProperties.stateComputeMode.isDirty() || csrSizeRequestFlags.numGrfRequiredChanged) {
         size += sizeof(typename Family::STATE_COMPUTE_MODE);
         if (csrSizeRequestFlags.hasSharedHandles) {
             size += sizeof(typename Family::PIPE_CONTROL);
diff --git a/shared/source/gen12lp/state_compute_mode_helper_gen12lp.cpp b/shared/source/gen12lp/state_compute_mode_helper_gen12lp.cpp
index 3b46c0c0c8..72030d55db 100644
--- a/shared/source/gen12lp/state_compute_mode_helper_gen12lp.cpp
+++ b/shared/source/gen12lp/state_compute_mode_helper_gen12lp.cpp
@@ -11,7 +11,7 @@ namespace NEO {
 
 template <>
 bool StateComputeModeHelper<TGLLPFamily>::isStateComputeModeRequired(const CsrSizeRequestFlags &csrSizeRequestFlags, bool isThreadArbitionPolicyProgrammed) {
-    return csrSizeRequestFlags.hasSharedHandles || csrSizeRequestFlags.numGrfRequiredChanged;
+    return csrSizeRequestFlags.numGrfRequiredChanged;
 }
 
 } // namespace NEO