diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp
index a1a6daa0c0..c7ba629086 100644
--- a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp
+++ b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp
@@ -130,7 +130,7 @@ HWTEST_F(HwInfoConfigTest, givenSamplerStateWhenAdjustSamplerStateThenNothingIsC
     auto sampler = clUniquePtr(new SamplerHw<FamilyType>(context.get(), CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST));
     auto state = FamilyType::cmdInitSamplerState;
     auto initialState = state;
-    hwInfoConfig->adjustSamplerState(&state);
+    hwInfoConfig->adjustSamplerState(&state, pInHwInfo);
 
     EXPECT_EQ(0, memcmp(&initialState, &state, sizeof(SAMPLER_STATE)));
 }
diff --git a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp
index f9fa1c6f2e..7372c49ea8 100644
--- a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp
+++ b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp
@@ -84,7 +84,7 @@ bool HwInfoConfigHw<IGFX_UNKNOWN>::isEvenContextCountRequired() {
 }
 
 template <>
-void HwInfoConfigHw<IGFX_UNKNOWN>::adjustSamplerState(void *sampler){};
+void HwInfoConfigHw<IGFX_UNKNOWN>::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo){};
 
 template <>
 void HwInfoConfigHw<IGFX_UNKNOWN>::convertTimestampsFromOaToCsDomain(uint64_t &timestampData){};
diff --git a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp
index 7fac9e0f2d..a7c7d37508 100644
--- a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp
@@ -65,7 +65,7 @@ template <>
 void HwInfoConfigHw<IGFX_UNKNOWN>::convertTimestampsFromOaToCsDomain(uint64_t &timestampData){};
 
 template <>
-void HwInfoConfigHw<IGFX_UNKNOWN>::adjustSamplerState(void *sampler){};
+void HwInfoConfigHw<IGFX_UNKNOWN>::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo){};
 
 HwInfoConfigTestWindows::HwInfoConfigTestWindows() {
     this->executionEnvironment = std::make_unique<MockExecutionEnvironment>();
diff --git a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp
index 1675cac67a..35a702bfbf 100644
--- a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp
+++ b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp
@@ -587,7 +587,7 @@ HWTEST_P(FilterModeTest, WhenSettingKernelArgSamplerThenFiltersAreCorrect) {
     sampler = Sampler::create(
         context,
         CL_TRUE,
-        CL_ADDRESS_MIRRORED_REPEAT,
+        CL_ADDRESS_NONE,
         filterMode,
         retVal);
 
diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h
index 563aca3b11..4343616ea5 100644
--- a/shared/source/os_interface/hw_info_config.h
+++ b/shared/source/os_interface/hw_info_config.h
@@ -28,7 +28,7 @@ class HwInfoConfig {
     int configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *outHwInfo, OSInterface *osIface);
     virtual int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) = 0;
     virtual void adjustPlatformForProductFamily(HardwareInfo *hwInfo) = 0;
-    virtual void adjustSamplerState(void *sampler) = 0;
+    virtual void adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) = 0;
     virtual uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) = 0;
     virtual uint64_t getDeviceMemCapabilities() = 0;
     virtual uint64_t getSingleDeviceSharedMemCapabilities() = 0;
@@ -49,7 +49,7 @@ class HwInfoConfigHw : public HwInfoConfig {
     }
     int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) override;
     void adjustPlatformForProductFamily(HardwareInfo *hwInfo) override;
-    void adjustSamplerState(void *sampler) override;
+    void adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) override;
     uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) override;
     uint64_t getDeviceMemCapabilities() override;
     uint64_t getSingleDeviceSharedMemCapabilities() override;
diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl
index 790fd70f28..c874c8fc16 100644
--- a/shared/source/os_interface/hw_info_config.inl
+++ b/shared/source/os_interface/hw_info_config.inl
@@ -43,7 +43,7 @@ template <PRODUCT_FAMILY gfxProduct>
 void HwInfoConfigHw<gfxProduct>::adjustPlatformForProductFamily(HardwareInfo *hwInfo) {}
 
 template <PRODUCT_FAMILY gfxProduct>
-void HwInfoConfigHw<gfxProduct>::adjustSamplerState(void *sampler) {}
+void HwInfoConfigHw<gfxProduct>::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) {}
 
 template <PRODUCT_FAMILY gfxProduct>
 void HwInfoConfigHw<gfxProduct>::enableRenderCompression(HardwareInfo *hwInfo) {