diff --git a/src/libs/gocmdbridge/client/cmdbridgeclient.cpp b/src/libs/gocmdbridge/client/cmdbridgeclient.cpp
index 51f75c43f8b..21028853bf0 100644
--- a/src/libs/gocmdbridge/client/cmdbridgeclient.cpp
+++ b/src/libs/gocmdbridge/client/cmdbridgeclient.cpp
@@ -245,7 +245,7 @@ Client::Client(const Utils::FilePath &remoteCmdBridgePath)
 Client::~Client()
 {
     if (d->thread->isRunning() && exit())
-        d->thread->wait();
+        d->thread->wait(2000);
 }
 
 expected_str<QFuture<Environment>> Client::start()