diff --git a/apps/staged/src-tauri/src/git/github.rs b/apps/staged/src-tauri/src/git/github.rs
index 39a25f9b..b49faebd 100644
--- a/apps/staged/src-tauri/src/git/github.rs
+++ b/apps/staged/src-tauri/src/git/github.rs
@@ -763,7 +763,7 @@ fn clone_lock_for_repo(github_repo: &str) -> Arc<Mutex<()>> {
 /// Fetch the latest from origin and reset the main checkout's working tree to
 /// the remote default branch tip.
 ///
-/// This ensures the files on disk in the bare/main clone reflect the latest
+/// This ensures the files on disk in the main clone reflect the latest
 /// upstream state — critical for action detection which reads files from the
 /// working tree. Worktrees are separate directories and are **not** affected
 /// by this reset.
diff --git a/apps/staged/src-tauri/src/web_server.rs b/apps/staged/src-tauri/src/web_server.rs
index aa6a978b..19be6008 100644
--- a/apps/staged/src-tauri/src/web_server.rs
+++ b/apps/staged/src-tauri/src/web_server.rs
@@ -311,14 +311,13 @@ async fn handle_ws(mut socket: WebSocket, state: WebAppState) {
             }
             // Handle incoming messages (ping/pong, close)
             msg = socket.recv() => {
-                match msg {
+                let pong_data = match msg {
                     Some(Ok(Message::Close(_))) | None => break,
-                    Some(Ok(Message::Ping(data))) => {
-                        if socket.send(Message::Pong(data)).await.is_err() {
-                            break;
-                        }
-                    }
-                    _ => {}
+                    Some(Ok(Message::Ping(data))) => data,
+                    _ => continue,
+                };
+                if socket.send(Message::Pong(pong_data)).await.is_err() {
+                    break;
                 }
             }
         }