1 files changed, 8 insertions, 5 deletions

diff --git a/editors/code/src/status_display.ts b/editors/code/src/status_display.ts
index 993e79d70..ed0d82166 100644
--- a/editors/code/src/status_display.ts
+++ b/editors/code/src/status_display.ts
@@ -9,11 +9,14 @@ const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '
 export function activateStatusDisplay(ctx: Ctx) {
     const statusDisplay = new StatusDisplay(ctx.config.cargoWatchOptions.command);
     ctx.pushCleanup(statusDisplay);
-    ctx.onDidRestart(client => ctx.pushCleanup(client.onProgress(
-        WorkDoneProgress.type,
-        'rustAnalyzer/cargoWatcher',
-        params => statusDisplay.handleProgressNotification(params)
-    )));
+    const client = ctx.client;
+    if (client != null) {
+        ctx.pushCleanup(client.onProgress(
+            WorkDoneProgress.type,
+            'rustAnalyzer/cargoWatcher',
+            params => statusDisplay.handleProgressNotification(params)
+        ))
+    }
 }
 
 class StatusDisplay implements Disposable {