diff --git a/rocclr/platform/commandqueue.cpp b/rocclr/platform/commandqueue.cpp
index 63252fb455..2cc9a75078 100644
--- a/rocclr/platform/commandqueue.cpp
+++ b/rocclr/platform/commandqueue.cpp
@@ -88,9 +88,10 @@ bool HostQueue::terminate() {
 void HostQueue::finish() {
   Command* command = nullptr;
   if (IS_HIP) {
-    command = getLastQueuedCommand(false);
+    command = getLastQueuedCommand(true);
     if (nullptr != command) {
       command->awaitCompletion();
+      command->release();
     }
   }
   if (nullptr == command) {