diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
index 5514d3c55a..809883abff 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp
@@ -536,6 +536,7 @@ HWTEST_P(CommandStreamReceiverWithAubDumpTest, givenCommandStreamReceiverWithAub
     EXPECT_EQ(1u, csrWithAubDump->peekLatestSentTaskCount());
     if (createAubCSR) {
         EXPECT_EQ(csrWithAubDump->peekLatestSentTaskCount(), csrWithAubDump->getAubMockCsr().peekLatestSentTaskCount());
+        EXPECT_EQ(csrWithAubDump->peekLatestSentTaskCount(), csrWithAubDump->getAubMockCsr().peekLatestFlushedTaskCount());
     }
 
     memoryManager->freeGraphicsMemoryImpl(commandBuffer);
diff --git a/shared/source/command_stream/command_stream_receiver.h b/shared/source/command_stream/command_stream_receiver.h
index 321bf623da..9b05221c00 100644
--- a/shared/source/command_stream/command_stream_receiver.h
+++ b/shared/source/command_stream/command_stream_receiver.h
@@ -214,6 +214,9 @@ class CommandStreamReceiver {
     void setLatestSentTaskCount(uint32_t latestSentTaskCount) {
         this->latestSentTaskCount = latestSentTaskCount;
     }
+    void setLatestFlushedTaskCount(uint32_t latestFlushedTaskCount) {
+        this->latestFlushedTaskCount = latestFlushedTaskCount;
+    }
 
     virtual uint32_t blitBuffer(const BlitPropertiesContainer &blitPropertiesContainer, bool blocking, bool profilingEnabled, Device &device) = 0;
 
diff --git a/shared/source/command_stream/command_stream_receiver_with_aub_dump.inl b/shared/source/command_stream/command_stream_receiver_with_aub_dump.inl
index dbc565b9ba..ec631f5134 100644
--- a/shared/source/command_stream/command_stream_receiver_with_aub_dump.inl
+++ b/shared/source/command_stream/command_stream_receiver_with_aub_dump.inl
@@ -36,7 +36,9 @@ bool CommandStreamReceiverWithAUBDump<BaseCSR>::flush(BatchBuffer &batchBuffer,
     if (aubCSR) {
         aubCSR->flush(batchBuffer, allocationsForResidency);
         aubCSR->setLatestSentTaskCount(BaseCSR::peekLatestSentTaskCount());
+        aubCSR->setLatestFlushedTaskCount(BaseCSR::peekLatestSentTaskCount());
     }
+
     return BaseCSR::flush(batchBuffer, allocationsForResidency);
 }