1 files changed, 4 insertions, 2 deletions

diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts
index 8324060e8..6f61883cd 100644
--- a/editors/code/src/commands/on_enter.ts
+++ b/editors/code/src/commands/on_enter.ts
@@ -6,15 +6,17 @@ import { Cmd, Ctx } from '../ctx';
 export function onEnter(ctx: Ctx): Cmd {
     return async (event: { text: string }) => {
         const editor = ctx.activeRustEditor;
+        const client = ctx.client;
         if (!editor || event.text !== '\n') return false;
+        if (!client) return false;
 
         const request: lc.TextDocumentPositionParams = {
             textDocument: { uri: editor.document.uri.toString() },
-            position: ctx.client.code2ProtocolConverter.asPosition(
+            position: client.code2ProtocolConverter.asPosition(
                 editor.selection.active,
             ),
         };
-        const change = await ctx.client.sendRequest<undefined | SourceChange>(
+        const change = await client.sendRequest<undefined | SourceChange>(
             'rust-analyzer/onEnter',
             request,
         );