diff --git a/pkg/cmd/codespace/jupyter.go b/pkg/cmd/codespace/jupyter.go
index 7b4c6963b..2fe6083bc 100644
--- a/pkg/cmd/codespace/jupyter.go
+++ b/pkg/cmd/codespace/jupyter.go
@@ -51,11 +51,7 @@ func (a *App) Jupyter(ctx context.Context, selector *CodespaceSelector) (err err
 		if err != nil {
 			return
 		}
-
-		err = invoker.Close()
-		if err != nil {
-			return
-		}
+		defer safeClose(invoker, &err)
 
 		serverPort, serverUrl, err = invoker.StartJupyterServer(ctx)
 		return
diff --git a/pkg/cmd/codespace/logs.go b/pkg/cmd/codespace/logs.go
index 0457af999..b0dc80459 100644
--- a/pkg/cmd/codespace/logs.go
+++ b/pkg/cmd/codespace/logs.go
@@ -61,11 +61,7 @@ func (a *App) Logs(ctx context.Context, selector *CodespaceSelector, follow bool
 		if err != nil {
 			return
 		}
-
-		err = invoker.Close()
-		if err != nil {
-			return
-		}
+		defer safeClose(invoker, &err)
 
 		remoteSSHServerPort, sshUser, err = invoker.StartSSHServer(ctx)
 		return
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
index d51626e20..f8889a56b 100644
--- a/pkg/cmd/codespace/ssh.go
+++ b/pkg/cmd/codespace/ssh.go
@@ -177,11 +177,7 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
 		if err != nil {
 			return
 		}
-
-		err = invoker.Close()
-		if err != nil {
-			return
-		}
+		defer safeClose(invoker, &err)
 
 		remoteSSHServerPort, sshUser, err = invoker.StartSSHServerWithOptions(ctx, startSSHOptions)
 		return