diff --git a/rocclr/hip_conversions.hpp b/rocclr/hip_conversions.hpp
index 99f143b7c9..35948703ad 100644
--- a/rocclr/hip_conversions.hpp
+++ b/rocclr/hip_conversions.hpp
@@ -126,11 +126,11 @@ cl_addressing_mode getCLAddressingMode(const hipTextureAddressMode hipAddressMod
     case hipAddressModeWrap:
       return CL_ADDRESS_REPEAT;
     case hipAddressModeClamp:
-      return CL_ADDRESS_CLAMP;
+      return CL_ADDRESS_CLAMP_TO_EDGE;
     case hipAddressModeMirror:
       return CL_ADDRESS_MIRRORED_REPEAT;
     case hipAddressModeBorder:
-      return CL_ADDRESS_CLAMP_TO_EDGE;
+      return CL_ADDRESS_CLAMP;
   }
 
   ShouldNotReachHere();