diff --git a/src/lsp/ClientConnectionManager.ts b/src/lsp/ClientConnectionManager.ts
index 210019ee8..252311035 100644
--- a/src/lsp/ClientConnectionManager.ts
+++ b/src/lsp/ClientConnectionManager.ts
@@ -75,7 +75,9 @@ export class ClientConnectionManager {
 
 	private create_new_client() {
 		const port = this.client?.port ?? -1;
+		this.client?.io?.removeAllListeners();
 		this.client?.events?.removeAllListeners();
+		this.client?.stop();
 		this.client = new GDScriptLanguageClient();
 		this.client.port = port;
 		this.client.events.on("status", this.on_client_status_changed.bind(this));