diff --git a/src/common/server.ts b/src/common/server.ts
index afe5dc9..f75502d 100644
--- a/src/common/server.ts
+++ b/src/common/server.ts
@@ -87,9 +87,9 @@ export async function restartServer(
         } catch (ex) {
             traceError(`Server: Stop failed: ${ex}`);
         }
-        _disposables.forEach((d) => d.dispose());
-        _disposables = [];
     }
+    _disposables.forEach((d) => d.dispose());
+    _disposables = [];
     updateStatus(undefined, LanguageStatusSeverity.Information, true);
 
     const newLSClient = await createServer(workspaceSetting, serverId, serverName, outputChannel, {
diff --git a/src/extension.ts b/src/extension.ts
index 5f2ca38..0f1e346 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -113,6 +113,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 
 export async function deactivate(): Promise<void> {
     if (lsClient) {
-        await lsClient.stop();
+        try {
+            await lsClient.stop();
+        } catch (ex) {
+            traceError(`Server: Stop failed: ${ex}`);
+        }
     }
 }