diff --git a/intern/cycles/device/hip/device_impl.cpp b/intern/cycles/device/hip/device_impl.cpp
index bbbe357bf76..198fc9c6cc5 100644
--- a/intern/cycles/device/hip/device_impl.cpp
+++ b/intern/cycles/device/hip/device_impl.cpp
@@ -661,9 +661,7 @@ void HIPDevice::tex_alloc(device_texture &mem)
       address_mode = hipAddressModeClamp;
       break;
     case EXTENSION_CLIP:
-      /* TODO(@arya): setting this to Mode Clamp instead of Mode Border
-       * because it's unsupported in HIP. */
-      address_mode = hipAddressModeClamp;
+      address_mode = hipAddressModeBorder;
       break;
     case EXTENSION_MIRROR:
       address_mode = hipAddressModeMirror;