diff --git a/ui/desktop/src/utils/lapstone-tunnel.ts b/ui/desktop/src/utils/lapstone-tunnel.ts
index ab81ecb751..3575113dea 100644
--- a/ui/desktop/src/utils/lapstone-tunnel.ts
+++ b/ui/desktop/src/utils/lapstone-tunnel.ts
@@ -199,9 +199,13 @@ function connect(port: number, agentId: string): void {
   });
 
   ws.on('message', async (data) => {
-    lastActivityTime = Date.now();
-    const message = JSON.parse(data.toString());
-    await handleRequest(message);
+    try {
+      lastActivityTime = Date.now();
+      const message = JSON.parse(data.toString());
+      await handleRequest(message);
+    } catch (error) {
+      log.error('Error handling WebSocket message:', error);
+    }
   });
 
   ws.on('close', () => {