diff --git a/hipamd/src/hip_device_runtime.cpp b/hipamd/src/hip_device_runtime.cpp
index 7eb3f172e0..c024216a9b 100644
--- a/hipamd/src/hip_device_runtime.cpp
+++ b/hipamd/src/hip_device_runtime.cpp
@@ -558,7 +558,7 @@ hipError_t hipGetDeviceFlags ( unsigned int* flags ) {
 }
 
 hipError_t hipSetDevice ( int  device ) {
-  HIP_INIT_API(hipSetDevice, device);
+  HIP_INIT_API_NO_RETURN(hipSetDevice, device);
   if (static_cast<unsigned int>(device) < g_devices.size()) {
     hip::setCurrentDevice(device);