diff --git a/src/libs/clangbackendipc/connectionclient.cpp b/src/libs/clangbackendipc/connectionclient.cpp
index 90a6d4a4718..83b01fc4a23 100644
--- a/src/libs/clangbackendipc/connectionclient.cpp
+++ b/src/libs/clangbackendipc/connectionclient.cpp
@@ -99,8 +99,8 @@ bool ConnectionClient::isConnected() const
 
 void ConnectionClient::ensureCommandIsWritten()
 {
-    while (localSocket.bytesToWrite() > 0)
-        localSocket.waitForBytesWritten();
+    while (isConnected() && localSocket.bytesToWrite() > 0)
+        localSocket.waitForBytesWritten(50);
 }
 
 void ConnectionClient::sendEndCommand()