diff --git a/opencl/source/command_queue/enqueue_common.h b/opencl/source/command_queue/enqueue_common.h
index c2354b6a12..a1979a82d7 100644
--- a/opencl/source/command_queue/enqueue_common.h
+++ b/opencl/source/command_queue/enqueue_common.h
@@ -245,8 +245,8 @@ cl_int CommandQueueHw<GfxFamily>::enqueueHandler(Surface **surfacesForResidency,
         DEBUG_BREAK_IF(relaxedOrderingForGpgpuAllowed(1)); // IOQ has >=1 dependencies
         PipeControlArgs args;
         args.csStallOnly = true;
-        args.hdcPipelineFlush = true;
-        args.unTypedDataPortCacheFlush = true;
+        args.hdcPipelineFlush = false;
+        args.unTypedDataPortCacheFlush = false;
         MemorySynchronizationCommands<GfxFamily>::addSingleBarrier(commandStream, args);
     }
 
diff --git a/opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp
index 8716e84f7b..02c5657684 100644
--- a/opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp
+++ b/opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp
@@ -1743,13 +1743,14 @@ HWTEST2_F(TimestampPacketTests, givenTimestampPacketWriteEnabledAndDependenciesR
         PIPE_CONTROL *pipeControlCmd = genCmdCast<PIPE_CONTROL *>(*it);
         MI_BATCH_BUFFER_END *miBatchBufferEnd = genCmdCast<MI_BATCH_BUFFER_END *>(*it);
         if (pipeControlCmd != nullptr) {
-            EXPECT_TRUE(pipeControlCmd->getHdcPipelineFlush());
-            EXPECT_TRUE(pipeControlCmd->getUnTypedDataPortCacheFlush());
-            EXPECT_TRUE(pipeControlCmd->getCommandStreamerStallEnable());
             if (currentEnqueue == 1) {
                 ++pipeControlCountFirstEnqueue;
             } else if (currentEnqueue == 2) {
-                ++pipeControlCountSecondEnqueue;
+                if (++pipeControlCountSecondEnqueue == 1) {
+                    EXPECT_FALSE(pipeControlCmd->getHdcPipelineFlush());
+                    EXPECT_FALSE(pipeControlCmd->getUnTypedDataPortCacheFlush());
+                    EXPECT_TRUE(pipeControlCmd->getCommandStreamerStallEnable());
+                }
             }
         } else if (semaphoreWaitCmd != nullptr) {
             ++semaphoreWaitCount;