diff --git a/level_zero/core/source/sampler/sampler_hw.inl b/level_zero/core/source/sampler/sampler_hw.inl
index f070774103..62f22c4426 100644
--- a/level_zero/core/source/sampler/sampler_hw.inl
+++ b/level_zero/core/source/sampler/sampler_hw.inl
@@ -27,13 +27,14 @@ ze_result_t SamplerCoreFamily<gfxCoreFamily>::initialize(Device *device, const z
 
     switch (desc->addressMode) {
     case ZE_SAMPLER_ADDRESS_MODE_NONE:
-    case ZE_SAMPLER_ADDRESS_MODE_CLAMP:
         break;
-    case ZE_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER:
+    case ZE_SAMPLER_ADDRESS_MODE_CLAMP:
         addressControlModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
         addressControlModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
         addressControlModeZ = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP;
         break;
+    case ZE_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER:
+        break;
     case ZE_SAMPLER_ADDRESS_MODE_MIRROR:
         addressControlModeX = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
         addressControlModeY = SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR;
diff --git a/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp b/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp
index a29caaa0a7..54d6bd314c 100644
--- a/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp
+++ b/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp
@@ -85,11 +85,11 @@ HWTEST2_P(SamplerCreateTest, givenDifferentDescriptorValuesThenSamplerIsCorrectl
         EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_WRAP,
                   sampler->samplerState.getTczAddressControlMode());
     } else if (addressMode == ZE_SAMPLER_ADDRESS_MODE_CLAMP) {
-        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER,
+        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP,
                   sampler->samplerState.getTcxAddressControlMode());
-        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER,
+        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP,
                   sampler->samplerState.getTcyAddressControlMode());
-        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER,
+        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP,
                   sampler->samplerState.getTczAddressControlMode());
     } else if (addressMode == ZE_SAMPLER_ADDRESS_MODE_MIRROR) {
         EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR,
@@ -99,11 +99,11 @@ HWTEST2_P(SamplerCreateTest, givenDifferentDescriptorValuesThenSamplerIsCorrectl
         EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_MIRROR,
                   sampler->samplerState.getTczAddressControlMode());
     } else if (addressMode == ZE_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER) {
-        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP,
+        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER,
                   sampler->samplerState.getTcxAddressControlMode());
-        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP,
+        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER,
                   sampler->samplerState.getTcyAddressControlMode());
-        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP,
+        EXPECT_EQ(SAMPLER_STATE::TEXTURE_COORDINATE_MODE_CLAMP_BORDER,
                   sampler->samplerState.getTczAddressControlMode());
     }