diff --git a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl
index 2e28c25f50..6167b4d0d5 100644
--- a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl
+++ b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl
@@ -293,10 +293,8 @@ GEN12LPTEST_F(Gen12LpCoherencyRequirements, givenCoherencyRequirementWithSharedH
         for (auto it = hwParser.cmdList.begin(); it != hwParser.cmdList.end(); it++) {
             auto cmd = genCmdCast<STATE_COMPUTE_MODE *>(*it);
             if (cmd) {
-                if (valueChanged) {
-                    EXPECT_EQ(expectedCoherentValue, cmd->getForceNonCoherent());
-                }
-                EXPECT_EQ(valueChanged ? expectedCoherentMask : 0u, cmd->getMaskBits());
+                EXPECT_EQ(expectedCoherentValue, cmd->getForceNonCoherent());
+                EXPECT_EQ(expectedCoherentMask, cmd->getMaskBits());
                 EXPECT_FALSE(foundOne);
                 foundOne = true;
                 auto pc = genCmdCast<PIPE_CONTROL *>(*(++it));
diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/compute_mode_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/compute_mode_tests_pvc.cpp
index dfff3ff4cb..48d55c6f3a 100644
--- a/opencl/test/unit_test/xe_hpc_core/pvc/compute_mode_tests_pvc.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/pvc/compute_mode_tests_pvc.cpp
@@ -184,12 +184,14 @@ PVCTEST_F(PvcComputeModeRequirements, giventhreadArbitrationPolicyWithoutSharedH
         hwParser.parseCommands<FamilyType>(getCsrHw<FamilyType>()->commandStream, startOffset);
         bool foundOne = false;
 
-        uint32_t expectedCoherentMask = FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask;
+        uint32_t expectedCoherentMask = FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask |
+                                        FamilyType::stateComputeModeLargeGrfModeMask |
+                                        FamilyType::stateComputeModeForceNonCoherentMask;
 
         for (auto it = hwParser.cmdList.begin(); it != hwParser.cmdList.end(); it++) {
             auto cmd = genCmdCast<STATE_COMPUTE_MODE *>(*it);
             if (cmd) {
-                EXPECT_EQ(expectToBeProgrammed ? expectedCoherentMask : 0u, cmd->getMaskBits());
+                EXPECT_EQ(expectedCoherentMask, cmd->getMaskBits());
                 EXPECT_FALSE(foundOne);
                 foundOne = true;
                 auto pc = genCmdCast<PIPE_CONTROL *>(*(++it));
diff --git a/shared/source/command_stream/command_stream_receiver_hw_tgllp_and_later.inl b/shared/source/command_stream/command_stream_receiver_hw_tgllp_and_later.inl
index 7a208cb109..7a8588ccd6 100644
--- a/shared/source/command_stream/command_stream_receiver_hw_tgllp_and_later.inl
+++ b/shared/source/command_stream/command_stream_receiver_hw_tgllp_and_later.inl
@@ -26,7 +26,9 @@ void CommandStreamReceiverHw<GfxFamily>::programComputeMode(LinearStream &stream
             addPipeControlPriorToNonPipelinedStateCommand(stream, args);
         }
 
-        EncodeComputeMode<GfxFamily>::programComputeModeCommand(stream, this->streamProperties.stateComputeMode, hwInfo);
+        StreamProperties streamProperties{};
+        streamProperties.stateComputeMode.setProperties(this->streamProperties.stateComputeMode);
+        EncodeComputeMode<GfxFamily>::programComputeModeCommand(stream, streamProperties.stateComputeMode, hwInfo);
 
         if (csrSizeRequestFlags.hasSharedHandles) {
             auto pc = stream.getSpaceForCmd<PIPE_CONTROL>();