diff --git a/src/anbox/qemu/adb_message_processor.cpp b/src/anbox/qemu/adb_message_processor.cpp
index 24d3bb7..5652be1 100644
--- a/src/anbox/qemu/adb_message_processor.cpp
+++ b/src/anbox/qemu/adb_message_processor.cpp
@@ -74,10 +74,11 @@ void AdbMessageProcessor::advance_state() {
 
       if (state_ == closed_by_host) {
         host_connector_.reset();
-        return;
+      } else {
+        wait_for_host_connection();
       }
 
-      wait_for_host_connection();
+      lock_.unlock();
       break;
     case waiting_for_host_connection:
       messenger_->send(reinterpret_cast<const char *>(ok_command.data()),