diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_command.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_command.cpp
index 1b4cb5fd63..5dc44b67c6 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_command.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_command.cpp
@@ -105,6 +105,11 @@ RUNTIME_ENTRY_RET(cl_command_queue, clCreateCommandQueueWithProperties, (
         ++p;
     }
 
+    if (queueSize > amdDevice.info().queueOnDeviceMaxSize_) {
+        *not_null(errcode_ret) = CL_INVALID_VALUE;
+        return (cl_command_queue) 0;
+    }
+
     amd::CommandQueue* queue = NULL;
     {
         amd::ScopedLock  lock(amdContext.lock());