From 069c3aaea375cbdd8c73e2a5fac1b5d874e950e4 Mon Sep 17 00:00:00 2001
From: Siyuan <siyuan@buildjet.com>
Date: Wed, 19 Nov 2025 09:04:14 +0000
Subject: [PATCH] chore: call removeEventListener before resetHandshake in
 useHidRpc

---
 ui/src/hooks/useHidRpc.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/hooks/useHidRpc.ts b/ui/src/hooks/useHidRpc.ts
index 1652b7c8..38014d20 100644
--- a/ui/src/hooks/useHidRpc.ts
+++ b/ui/src/hooks/useHidRpc.ts
@@ -103,12 +103,12 @@ export function doRpcHidHandshake(rpcHidChannel: RTCDataChannel, setRpcHidProtoc
 
     setRpcHidProtocolVersion(message.version);
 
-    // clean up 
     const timeUsed = lastSendTime ? Date.now() - lastSendTime.getTime() : 0;
     logger.info(`Handshake completed in ${timeUsed}ms after ${attempts} attempts (Version: ${message.version} / ${HID_RPC_VERSION})`);
-    resetHandshake({ completed: true });
 
+    // clean up 
     rpcHidChannel.removeEventListener("message", onMessage);
+    resetHandshake({ completed: true });
   };
 
   const resetHandshake = ({ lastConnectedTime: newLastConnectedTime, completed }: { lastConnectedTime?: Date | undefined, completed?: boolean }) => {