2 files changed, 2 insertions, 5 deletions
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index a8d57a0e684..8a2dea6b35b 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -261,10 +261,6 @@ export async function createClient(
 }
 
 class ExperimentalFeatures implements lc.StaticFeature {
-    getState(): lc.FeatureState {
-        return { kind: "static" };
-    }
-
     fillClientCapabilities(capabilities: lc.ClientCapabilities): void {
         const caps: any = capabilities.experimental ?? {};
         caps.snippetTextEdit = true;
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index f2d47370105..0dea1b87b2f 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -42,7 +42,8 @@ export class Ctx {
 
         const res = new Ctx(config, extCtx, client, serverPath, statusBar);
 
-        await client.start();
+        res.pushCleanup(client.start());
+        await client.onReady();
         client.onNotification(ra.serverStatus, (params) => res.setServerStatus(params));
         return res;
     }