diff --git a/hipamd/src/hip_context.cpp b/hipamd/src/hip_context.cpp
index 0f4c4ce2c3..8c1dfc2933 100644
--- a/hipamd/src/hip_context.cpp
+++ b/hipamd/src/hip_context.cpp
@@ -196,7 +196,7 @@ hipError_t hipCtxGetSharedMemConfig(hipSharedMemConfig* pConfig) {
 }
 
 hipError_t hipRuntimeGetVersion(int *runtimeVersion) {
-  HIP_INIT_API(hipRuntimeGetVersion, runtimeVersion);
+  HIP_INIT_API_NO_RETURN(hipRuntimeGetVersion, runtimeVersion);
 
   if (!runtimeVersion) {
     HIP_RETURN(hipErrorInvalidValue);
@@ -264,7 +264,7 @@ hipError_t hipCtxPushCurrent(hipCtx_t ctx) {
 }
 
 hipError_t hipDriverGetVersion(int* driverVersion) {
-  HIP_INIT_API(hipDriverGetVersion, driverVersion);
+  HIP_INIT_API_NO_RETURN(hipDriverGetVersion, driverVersion);
 
   if (!driverVersion) {
     HIP_RETURN(hipErrorInvalidValue);
diff --git a/hipamd/src/hip_internal.hpp b/hipamd/src/hip_internal.hpp
index c2f6d57562..0bcab97f8e 100644
--- a/hipamd/src/hip_internal.hpp
+++ b/hipamd/src/hip_internal.hpp
@@ -108,6 +108,10 @@ static  amd::Monitor g_hipInitlock{"hipInit lock"};
   ClPrint(amd::LOG_INFO, amd::LOG_API, "%s: Returned %s : %s",                     \
           __func__, ihipGetErrorName(err), ToString( __VA_ARGS__ ).c_str());
 
+#define HIP_INIT_API_NO_RETURN(cid, ...)		     \
+  HIP_API_PRINT(__VA_ARGS__)                                 \
+  HIP_INIT_VOID()
+
 // This macro should be called at the beginning of every HIP API.
 #define HIP_INIT_API(cid, ...)                               \
   HIP_API_PRINT(__VA_ARGS__)                                 \