diff --git a/src/commands.ts b/src/commands.ts
index 20074cd..3560744 100644
--- a/src/commands.ts
+++ b/src/commands.ts
@@ -396,8 +396,3 @@ export async function jump(selected: vscode.TreeItem | undefined){
 	editor.revealRange(cursor_range, vscode.TextEditorRevealType.InCenter);
 }
 
-// This method is called when your extension is deactivated
-export function deactivate() {
-	//Maybe i should disconnect from every workspace and buffer ??? // TODO
-	// TODO
-}
\ No newline at end of file
diff --git a/src/extension.ts b/src/extension.ts
index 450ae58..f76fd32 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -45,6 +45,12 @@ export function activate(context: vscode.ExtensionContext) {
 	}
 }
 
+export async function deactivate() {
+	if (commands.client && commands.workspace) {
+		await commands.client.leave_workspace(commands.workspace.id());
+	}
+}
+
 async function log_poller_task(logger: codemp.JsLogger) {
 	while (true) {
 		let message = await logger.message();