diff --git a/arduino-ide-extension/src/node/language/arduino-language-server-contribution.ts b/arduino-ide-extension/src/node/language/arduino-language-server-contribution.ts
index 3369e32e..0404185b 100644
--- a/arduino-ide-extension/src/node/language/arduino-language-server-contribution.ts
+++ b/arduino-ide-extension/src/node/language/arduino-language-server-contribution.ts
@@ -41,6 +41,8 @@ export class ArduinoLanguageServerContribution extends BaseLanguageServerContrib
         console.log(`Starting language server ${languageServer} ${args.join(' ')}`);
         const serverConnection = await this.createProcessStreamConnectionAsync(languageServer, args);
         this.forward(clientConnection, serverConnection);
+        // https://github.com/eclipse-theia/theia/issues/6308
+        serverConnection.onClose(() => (clientConnection as any).reader.socket.close());
     }
 
     protected resolveExecutable(name: string): Promise<string> {