diff --git a/projects/clr/rocclr/platform/commandqueue.cpp b/projects/clr/rocclr/platform/commandqueue.cpp
index 1e150f08c7..1f47483bdd 100644
--- a/projects/clr/rocclr/platform/commandqueue.cpp
+++ b/projects/clr/rocclr/platform/commandqueue.cpp
@@ -79,7 +79,9 @@ bool HostQueue::terminate() {
               lastCommand = command;
             }
         }
-        lastCommand->awaitCompletion();
+        if (device_.gpu_error_ == CL_SUCCESS) {
+	  lastCommand->awaitCompletion();
+        }
         // Note that if lastCommand isn't a marker, it may not be lastEnqueueCommand_ now
         // after lastCommand->awaitCompletion() is called.
         if (lastEnqueueCommand_ != nullptr) {