diff --git a/src/runtime_src/core/common/api/hw_queue.cpp b/src/runtime_src/core/common/api/hw_queue.cpp
index 5b6bea81e38..489efff7350 100644
--- a/src/runtime_src/core/common/api/hw_queue.cpp
+++ b/src/runtime_src/core/common/api/hw_queue.cpp
@@ -401,9 +401,12 @@ class qds_device : public hw_queue_impl
   std::cv_status
   wait(size_t timeout_ms) override
   {
-    return m_qhdl->wait_command(nullptr, static_cast<int>(timeout_ms))
-      ? std::cv_status::no_timeout
-      : std::cv_status::timeout;
+    // OpenCL uses this function, but it is not implemented for
+    // platforms that implement hwqueue_handle.  Rework this if OpenCL
+    // needs to support shim hw queues.  Probably use a combination of
+    // counters or cached commands, or change command monitor to track
+    // order of submitted commands.
+    throw std::runtime_error("qds_device::wait() not implemented");
   }
 
   std::cv_status
diff --git a/src/runtime_src/core/common/shim/hwqueue_handle.h b/src/runtime_src/core/common/shim/hwqueue_handle.h
index 5d2c55035ce..6cdbb97aaba 100644
--- a/src/runtime_src/core/common/shim/hwqueue_handle.h
+++ b/src/runtime_src/core/common/shim/hwqueue_handle.h
@@ -33,9 +33,6 @@ class hwqueue_handle
   // @cmd        Handle to command to wait for
   // @timeout_ms Timout in ms, 0 implies infinite wait.
   // @return     0 indicates timeout, anything else indicates completion
-  //
-  // If cmd buffer handle is nullptr, then this function is supposed to wait
-  // until any command completes execution.
   virtual int
   wait_command(buffer_handle* cmd, uint32_t timeout_ms) const = 0;