diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp
index df51566447..ad0a02ee52 100644
--- a/projects/clr/hipamd/src/hip_module.cpp
+++ b/projects/clr/hipamd/src/hip_module.cpp
@@ -912,9 +912,12 @@ hipError_t hipLaunchCooperativeKernel_spt(const void* f, dim3 gridDim, dim3 bloc
 
 hipError_t ihipLaunchCooperativeKernelMultiDevice(hipLaunchParams* launchParamsList, int numDevices,
                                                   unsigned int flags, uint32_t extFlags) {
-  if (launchParamsList == nullptr || numDevices > g_devices.size()) {
+  if (launchParamsList == nullptr) {
     return hipErrorInvalidValue;
   }
+  if (numDevices > g_devices.size()) {
+    return hipErrorInvalidDevice;
+  }
 
   std::vector<hipFunctionLaunchParams> functionLaunchParamsList(numDevices);
   // Convert hipLaunchParams to hipFunctionLaunchParams
diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
index 8d9e88f2f3..0a200c435d 100644
--- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
+++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux
@@ -100,7 +100,6 @@
         "SWDEV-442583: Below tests failing in stress test on 12/01/24 ===",
         "Unit_hipLaunchCooperativeKernelMultiDevice_Negative_Parameters",
         "Unit_hipLaunchCooperativeKernelMultiDevice_Negative_MultiKernelSameDevice",
-        "Unit_hipExtLaunchMultiKernelMultiDevice_Negative_MultiKernelSameDevice",
         "=== Below tests are failing PSDB ===",
         "Unit_hipLaunchCooperativeKernel_Negative_Parameters",
         "Unit_hipLaunchKernel_Negative_Parameters",