diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
index 928bd044e..fbd479c38 100644
--- a/pkg/cmd/codespace/ssh.go
+++ b/pkg/cmd/codespace/ssh.go
@@ -62,17 +62,19 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
 		return fmt.Errorf("get or choose codespace: %w", err)
 	}
 
-	var debugLogger *fileLogger
+	liveshareLogger := noopLogger()
 	if opts.debug {
-		debugLogger, err = newFileLogger(opts.debugFile)
+		debugLogger, err := newFileLogger(opts.debugFile)
 		if err != nil {
 			return fmt.Errorf("error creating debug logger: %w", err)
 		}
 		defer safeClose(debugLogger, &err)
+
+		liveshareLogger = debugLogger.Logger
 		a.logger.Println("Debug file located at: " + debugLogger.Name())
 	}
 
-	session, err := codespaces.ConnectToLiveshare(ctx, a.logger, debugLogger, a.apiClient, codespace)
+	session, err := codespaces.ConnectToLiveshare(ctx, a.logger, liveshareLogger, a.apiClient, codespace)
 	if err != nil {
 		return fmt.Errorf("error connecting to Live Share: %w", err)
 	}
diff --git a/pkg/liveshare/client.go b/pkg/liveshare/client.go
index 840e99db9..9427ddf05 100644
--- a/pkg/liveshare/client.go
+++ b/pkg/liveshare/client.go
@@ -75,10 +75,6 @@ func Connect(ctx context.Context, opts Options) (*Session, error) {
 		return nil, err
 	}
 
-	if opts.Logger == nil {
-		return nil, errors.New("Logger is required")
-	}
-
 	sock := newSocket(uri, opts.TLSConfig)
 	if err := sock.connect(ctx); err != nil {
 		return nil, fmt.Errorf("error connecting websocket: %w", err)