diff --git a/shared/source/command_stream/command_stream_receiver.cpp b/shared/source/command_stream/command_stream_receiver.cpp
index 0123702e42..badfed4866 100644
--- a/shared/source/command_stream/command_stream_receiver.cpp
+++ b/shared/source/command_stream/command_stream_receiver.cpp
@@ -689,10 +689,6 @@ IndirectHeap &CommandStreamReceiver::getIndirectHeap(IndirectHeap::Type heapType
         internalAllocationStorage->storeAllocation(std::unique_ptr<GraphicsAllocation>(heapMemory), REUSABLE_ALLOCATION);
         heapMemory = nullptr;
         this->heapStorageRequiresRecyclingTag = true;
-
-        if (this->peekRootDeviceEnvironment().getProductHelper().isDcFlushMitigated()) {
-            this->registerDcFlushForDcMitigation();
-        }
     }
 
     if (!heapMemory) {
diff --git a/shared/source/gmm_helper/cache_settings_helper.cpp b/shared/source/gmm_helper/cache_settings_helper.cpp
index 49552a6a0f..2675d713df 100644
--- a/shared/source/gmm_helper/cache_settings_helper.cpp
+++ b/shared/source/gmm_helper/cache_settings_helper.cpp
@@ -47,7 +47,7 @@ bool CacheSettingsHelper::preferNoCpuAccess(GMM_RESOURCE_USAGE_TYPE_ENUM gmmReso
 }
 
 GMM_RESOURCE_USAGE_TYPE_ENUM CacheSettingsHelper::getDefaultUsageTypeWithCachingEnabled(AllocationType allocationType, const ProductHelper &productHelper) {
-    if (productHelper.overrideUsageForDcFlushMitigation(allocationType)) {
+    if (productHelper.overridePatAndUsageForDcFlushMitigation(allocationType)) {
         return getDefaultUsageTypeWithCachingDisabled(allocationType, productHelper);
     }
 
diff --git a/shared/source/os_interface/product_helper.h b/shared/source/os_interface/product_helper.h
index 1ef9d3fbbd..00dd82d8a5 100644
--- a/shared/source/os_interface/product_helper.h
+++ b/shared/source/os_interface/product_helper.h
@@ -135,9 +135,7 @@ class ProductHelper {
     virtual bool isDcFlushAllowed() const = 0;
     virtual bool isDcFlushMitigated() const = 0;
     virtual bool mitigateDcFlush() const = 0;
-    virtual bool overrideUsageForDcFlushMitigation(AllocationType allocationType) const = 0;
-    virtual bool overridePatToUCAndCohForDcFlushMitigation(AllocationType allocationType) const = 0;
-    virtual bool overridePatToUCAndNonCohForDcFlushMitigation(AllocationType allocationType) const = 0;
+    virtual bool overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const = 0;
     virtual bool overrideCacheableForDcFlushMitigation(AllocationType allocationType) const = 0;
     virtual uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const = 0;
     virtual bool getUuid(NEO::DriverModel *driverModel, const uint32_t subDeviceCount, const uint32_t deviceIndex, std::array<uint8_t, ProductHelper::uuidSize> &uuid) const = 0;
diff --git a/shared/source/os_interface/product_helper.inl b/shared/source/os_interface/product_helper.inl
index 6069289fa8..6435fae1b5 100644
--- a/shared/source/os_interface/product_helper.inl
+++ b/shared/source/os_interface/product_helper.inl
@@ -416,12 +416,7 @@ bool ProductHelperHw<gfxProduct>::isDcFlushMitigated() const {
 }
 
 template <PRODUCT_FAMILY gfxProduct>
-bool ProductHelperHw<gfxProduct>::overrideUsageForDcFlushMitigation(AllocationType allocationType) const {
-    return this->isDcFlushMitigated() && (this->overridePatToUCAndCohForDcFlushMitigation(allocationType) || overridePatToUCAndNonCohForDcFlushMitigation(allocationType));
-}
-
-template <PRODUCT_FAMILY gfxProduct>
-bool ProductHelperHw<gfxProduct>::overridePatToUCAndCohForDcFlushMitigation(AllocationType allocationType) const {
+bool ProductHelperHw<gfxProduct>::overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const {
     return this->isDcFlushMitigated() &&
            (this->overrideCacheableForDcFlushMitigation(allocationType) ||
             allocationType == AllocationType::timestampPacketTagBuffer ||
@@ -429,14 +424,6 @@ bool ProductHelperHw<gfxProduct>::overridePatToUCAndCohForDcFlushMitigation(Allo
             allocationType == AllocationType::gpuTimestampDeviceBuffer);
 }
 
-template <PRODUCT_FAMILY gfxProduct>
-bool ProductHelperHw<gfxProduct>::overridePatToUCAndNonCohForDcFlushMitigation(AllocationType allocationType) const {
-    return this->isDcFlushMitigated() &&
-           (this->overrideCacheableForDcFlushMitigation(allocationType) ||
-            allocationType == AllocationType::internalHeap ||
-            allocationType == AllocationType::linearStream);
-}
-
 template <PRODUCT_FAMILY gfxProduct>
 bool ProductHelperHw<gfxProduct>::overrideCacheableForDcFlushMitigation(AllocationType allocationType) const {
     return this->isDcFlushMitigated() &&
@@ -446,6 +433,8 @@ bool ProductHelperHw<gfxProduct>::overrideCacheableForDcFlushMitigation(Allocati
             allocationType == AllocationType::svmCpu ||
             allocationType == AllocationType::svmZeroCopy ||
             allocationType == AllocationType::internalHostMemory ||
+            allocationType == AllocationType::internalHeap ||
+            allocationType == AllocationType::linearStream ||
             allocationType == AllocationType::printfSurface);
 }
 
diff --git a/shared/source/os_interface/product_helper_hw.h b/shared/source/os_interface/product_helper_hw.h
index 1f467cea99..7b3260eb56 100644
--- a/shared/source/os_interface/product_helper_hw.h
+++ b/shared/source/os_interface/product_helper_hw.h
@@ -77,9 +77,7 @@ class ProductHelperHw : public ProductHelper {
     bool isDcFlushAllowed() const override;
     bool isDcFlushMitigated() const override;
     bool mitigateDcFlush() const override;
-    bool overrideUsageForDcFlushMitigation(AllocationType allocationType) const override;
-    bool overridePatToUCAndCohForDcFlushMitigation(AllocationType allocationType) const override;
-    bool overridePatToUCAndNonCohForDcFlushMitigation(AllocationType allocationType) const override;
+    bool overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const override;
     bool overrideCacheableForDcFlushMitigation(AllocationType allocationType) const override;
     uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const override;
     bool getUuid(NEO::DriverModel *driverModel, uint32_t subDeviceCount, uint32_t deviceIndex, std::array<uint8_t, ProductHelper::uuidSize> &uuid) const override;
diff --git a/shared/source/xe2_hpg_core/windows/product_helper_lnl.cpp b/shared/source/xe2_hpg_core/windows/product_helper_lnl.cpp
index 3b46970c16..b9675e76f4 100644
--- a/shared/source/xe2_hpg_core/windows/product_helper_lnl.cpp
+++ b/shared/source/xe2_hpg_core/windows/product_helper_lnl.cpp
@@ -28,14 +28,10 @@ int ProductHelperHw<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, O
 
 template <>
 uint64_t ProductHelperHw<gfxProduct>::overridePatIndex(bool isUncachedType, uint64_t patIndex, AllocationType allocationType) const {
-    if (this->overridePatToUCAndCohForDcFlushMitigation(allocationType)) {
+    if (this->overridePatAndUsageForDcFlushMitigation(allocationType)) {
         return 2; // L3: WB, L4: UC, 2-Way coh
     }
 
-    if (this->overridePatToUCAndNonCohForDcFlushMitigation(allocationType)) {
-        return 0; // L3: WB, L4: UC, Non coh
-    }
-
     return patIndex;
 }
 
diff --git a/shared/test/common/mocks/mock_product_helper.cpp b/shared/test/common/mocks/mock_product_helper.cpp
index 77cb4eac43..82573105a1 100644
--- a/shared/test/common/mocks/mock_product_helper.cpp
+++ b/shared/test/common/mocks/mock_product_helper.cpp
@@ -292,17 +292,7 @@ bool ProductHelperHw<IGFX_UNKNOWN>::mitigateDcFlush() const {
 }
 
 template <>
-bool ProductHelperHw<IGFX_UNKNOWN>::overridePatToUCAndCohForDcFlushMitigation(AllocationType allocationType) const {
-    return false;
-}
-
-template <>
-bool ProductHelperHw<IGFX_UNKNOWN>::overrideUsageForDcFlushMitigation(AllocationType allocationType) const {
-    return false;
-}
-
-template <>
-bool ProductHelperHw<IGFX_UNKNOWN>::overridePatToUCAndNonCohForDcFlushMitigation(AllocationType allocationType) const {
+bool ProductHelperHw<IGFX_UNKNOWN>::overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const {
     return false;
 }
 
diff --git a/shared/test/unit_test/os_interface/product_helper_tests.cpp b/shared/test/unit_test/os_interface/product_helper_tests.cpp
index cd2b86c22c..ae40a94cde 100644
--- a/shared/test/unit_test/os_interface/product_helper_tests.cpp
+++ b/shared/test/unit_test/os_interface/product_helper_tests.cpp
@@ -311,12 +311,12 @@ HWTEST_F(ProductHelperTest, givenVariousValuesWhenGettingAubStreamSteppingFromHw
     EXPECT_EQ(AubMemDump::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo));
 }
 
-HWTEST_F(ProductHelperTest, givenDcFlushMitigationWhenOverridePatToUCAndCohForDcFlushMitigationThenReturnCorrectValue) {
+HWTEST_F(ProductHelperTest, givenDcFlushMitigationWhenOverridePatAndUsageForDcFlushMitigationThenReturnCorrectValue) {
     DebugManagerStateRestore restorer;
     if (!productHelper->isDcFlushMitigated()) {
         for (auto i = 0; i < static_cast<int>(AllocationType::count); ++i) {
             auto allocationType = static_cast<AllocationType>(i);
-            EXPECT_FALSE(productHelper->overridePatToUCAndCohForDcFlushMitigation(allocationType));
+            EXPECT_FALSE(productHelper->overridePatAndUsageForDcFlushMitigation(allocationType));
         }
     }
     debugManager.flags.AllowDcFlush.set(0);
@@ -334,9 +334,9 @@ HWTEST_F(ProductHelperTest, givenDcFlushMitigationWhenOverridePatToUCAndCohForDc
             allocationType == AllocationType::linearStream ||
             allocationType == AllocationType::internalHeap ||
             allocationType == AllocationType::printfSurface) {
-            EXPECT_EQ(productHelper->overrideUsageForDcFlushMitigation(allocationType), productHelper->isDcFlushMitigated());
+            EXPECT_EQ(productHelper->overridePatAndUsageForDcFlushMitigation(allocationType), productHelper->isDcFlushMitigated());
         } else {
-            EXPECT_FALSE(productHelper->overridePatToUCAndCohForDcFlushMitigation(allocationType));
+            EXPECT_FALSE(productHelper->overridePatAndUsageForDcFlushMitigation(allocationType));
         }
     }
 }
diff --git a/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp b/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp
index 719c4cd22b..c82bdfa6f2 100644
--- a/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp
+++ b/shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp
@@ -146,6 +146,8 @@ LNLTEST_F(LnlProductHelper, givenExternalHostPtrWhenMitigateDcFlushThenOverrideC
             allocationType == AllocationType::svmZeroCopy ||
             allocationType == AllocationType::internalHostMemory ||
             allocationType == AllocationType::commandBuffer ||
+            allocationType == AllocationType::internalHeap ||
+            allocationType == AllocationType::linearStream ||
             allocationType == AllocationType::printfSurface) {
             EXPECT_TRUE(productHelper->overrideAllocationCacheable(allocationData));
         } else {
diff --git a/shared/test/unit_test/xe2_hpg_core/lnl/windows/product_helper_tests_lnl_windows.cpp b/shared/test/unit_test/xe2_hpg_core/lnl/windows/product_helper_tests_lnl_windows.cpp
index 90e0bdd8c2..2792e1e42a 100644
--- a/shared/test/unit_test/xe2_hpg_core/lnl/windows/product_helper_tests_lnl_windows.cpp
+++ b/shared/test/unit_test/xe2_hpg_core/lnl/windows/product_helper_tests_lnl_windows.cpp
@@ -40,8 +40,6 @@ LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenOverridePatIndexCalledT
     EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::internalHostMemory));
     EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::timestampPacketTagBuffer));
     EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::tagBuffer));
-    EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::linearStream));
-    EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::internalHeap));
 
     debugManager.flags.AllowDcFlush.set(0);
 
@@ -53,10 +51,6 @@ LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenOverridePatIndexCalledT
     EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::internalHostMemory));
     EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::timestampPacketTagBuffer));
     EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::tagBuffer));
-
-    expectedPatIndexOverride = 0u;
-    EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::linearStream));
-    EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::internalHeap));
 }
 
 LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenIsStagingBuffersEnabledThenTrueIsReturned) {