diff --git a/Jenkinsfile b/Jenkinsfile
index 08c1c03e6c..6fa427b660 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,4 +2,4 @@
 neoDependenciesRev='735095-769'
 strategy='EQUAL'
 allowedF=44
-allowedCD=353
+allowedCD=352
diff --git a/runtime/command_stream/command_stream_receiver_hw.inl b/runtime/command_stream/command_stream_receiver_hw.inl
index 13149762ba..b503210e62 100644
--- a/runtime/command_stream/command_stream_receiver_hw.inl
+++ b/runtime/command_stream/command_stream_receiver_hw.inl
@@ -267,30 +267,8 @@ CompletionStamp CommandStreamReceiverHw<GfxFamily>::flushTask(
     }
     // Add a PC if we have a dependency on a previous walker to avoid concurrency issues.
     if (taskLevel > this->taskLevel) {
-        //Some architectures (SKL) requires to have pipe control prior to pipe control with tag write, add it here
-        addPipeControlWA(commandStreamCSR, false);
-
-        auto pCmd = addPipeControlCmd(commandStreamCSR);
-
-        pCmd->setPostSyncOperation(PIPE_CONTROL::POST_SYNC_OPERATION_WRITE_IMMEDIATE_DATA);
-        if (DebugManager.flags.FlushAllCaches.get()) {
-            pCmd->setDcFlushEnable(true);
-            pCmd->setRenderTargetCacheFlushEnable(true);
-            pCmd->setInstructionCacheInvalidateEnable(true);
-            pCmd->setTextureCacheInvalidationEnable(true);
-            pCmd->setPipeControlFlushEnable(true);
-            pCmd->setVfCacheInvalidationEnable(true);
-            pCmd->setConstantCacheInvalidationEnable(true);
-            pCmd->setStateCacheInvalidationEnable(true);
-        }
-
-        auto address = (uint64_t)this->getTagAddress();
-        pCmd->setAddressHigh(address >> 32);
-        pCmd->setAddress(address & (0xffffffff));
-        pCmd->setImmediateData(this->taskCount);
-
+        addPipeControl(commandStreamCSR, false);
         this->taskLevel = taskLevel;
-        this->latestSentTaskCount = std::max(this->taskCount, (uint32_t)this->latestSentTaskCount);
         DBG_LOG(LogTaskCounts, __FUNCTION__, "Line: ", __LINE__, "this->taskCount", this->taskCount);
     }
 
diff --git a/unit_tests/profiling/profiling_tests.cpp b/unit_tests/profiling/profiling_tests.cpp
index b9c07d5a3c..e183f67e56 100644
--- a/unit_tests/profiling/profiling_tests.cpp
+++ b/unit_tests/profiling/profiling_tests.cpp
@@ -722,7 +722,7 @@ HWTEST_F(ProfilingWithPerfCountersTests, GIVENCommandQueueBlockedWithProflingPer
     pCmdQ->setPerfCountersEnabled(false, UINT32_MAX);
 }
 
-HWTEST_F(ProfilingWithPerfCountersTests, GIVENCommandQueueWithProfilingPerfCountersNoEventWHENWalkerIsDispatchedTHENPipeControlWithTimeStampIsPresentInCS) {
+HWTEST_F(ProfilingWithPerfCountersTests, GIVENCommandQueueWithProfilingPerfCountersNoEventWHENWalkerIsDispatchedTHENPipeControlWithTimeStampIsNotPresentInCS) {
     typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL;
     typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER;
     typedef typename FamilyType::MI_REPORT_PERF_COUNT MI_REPORT_PERF_COUNT;
@@ -771,7 +771,7 @@ HWTEST_F(ProfilingWithPerfCountersTests, GIVENCommandQueueWithProfilingPerfCount
     ASSERT_NE(nullptr, pAfterPC);
     EXPECT_EQ(1u, pAfterPC->getCommandStreamerStallEnable());
 
-    EXPECT_EQ(PIPE_CONTROL::POST_SYNC_OPERATION_WRITE_IMMEDIATE_DATA, pBeforePC->getPostSyncOperation());
+    EXPECT_EQ(PIPE_CONTROL::POST_SYNC_OPERATION_NO_WRITE, pBeforePC->getPostSyncOperation());
 
     // expect MI_REPORT_PERF_COUNT after WALKER
     auto itorAfterReportPerf = find<MI_REPORT_PERF_COUNT *>(itorGPGPUWalkerCmd, cmdList.end());