diff --git a/shared/source/command_container/encode_compute_mode_tgllp_and_later.inl b/shared/source/command_container/encode_compute_mode_tgllp_and_later.inl
index 95542e7af7..dd18685555 100644
--- a/shared/source/command_container/encode_compute_mode_tgllp_and_later.inl
+++ b/shared/source/command_container/encode_compute_mode_tgllp_and_later.inl
@@ -50,9 +50,7 @@ inline void EncodeComputeMode<Family>::programComputeModeCommandWithSynchronizat
         NEO::EncodeWA<Family>::addPipeControlPriorToNonPipelinedStateCommand(csr, args, hwInfo, isRcs);
     }
 
-    StreamProperties streamProperties{};
-    streamProperties.stateComputeMode.setProperties(properties);
-    EncodeComputeMode<Family>::programComputeModeCommand(csr, streamProperties.stateComputeMode, hwInfo);
+    EncodeComputeMode<Family>::programComputeModeCommand(csr, properties, hwInfo);
 
     if (hasSharedHandles) {
         auto pc = csr.getSpaceForCmd<PIPE_CONTROL>();
diff --git a/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp
index c943309871..5f9d5407c4 100644
--- a/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp
@@ -173,14 +173,12 @@ HWTEST2_F(XeHpcComputeModeRequirements, giventhreadArbitrationPolicyWithoutShare
         hwParser.parseCommands<FamilyType>(getCsrHw<FamilyType>()->commandStream, startOffset);
         bool foundOne = false;
 
-        uint32_t expectedCoherentMask = FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask |
-                                        FamilyType::stateComputeModeLargeGrfModeMask |
-                                        FamilyType::stateComputeModeForceNonCoherentMask;
+        uint32_t expectedMask = FamilyType::stateComputeModeEuThreadSchedulingModeOverrideMask;
 
         for (auto it = hwParser.cmdList.begin(); it != hwParser.cmdList.end(); it++) {
             auto cmd = genCmdCast<STATE_COMPUTE_MODE *>(*it);
             if (cmd) {
-                EXPECT_EQ(expectedCoherentMask, cmd->getMaskBits());
+                EXPECT_EQ(expectedMask, cmd->getMaskBits());
                 EXPECT_FALSE(foundOne);
                 foundOne = true;
                 auto pc = genCmdCast<PIPE_CONTROL *>(*(++it));