diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_common.hpp b/projects/clr/opencl/api/opencl/amdocl/cl_common.hpp
index c2ec8a1f86..aefe80c1d7 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_common.hpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_common.hpp
@@ -199,6 +199,9 @@ clSetEventWaitList(
         if (&context != &amdEvent->context()) {
             return CL_INVALID_CONTEXT;
         }
+        if (!amdEvent->notifyCmdQueue()) {
+            return CL_INVALID_EVENT_WAIT_LIST;
+        }
         eventWaitList.push_back(amdEvent);
     }
     return CL_SUCCESS;