diff --git a/src/utils/__tests__/udsMessaging.test.ts b/src/utils/__tests__/udsMessaging.test.ts
index 5a81916c6..8ad179d45 100644
--- a/src/utils/__tests__/udsMessaging.test.ts
+++ b/src/utils/__tests__/udsMessaging.test.ts
@@ -354,7 +354,6 @@ describe('UDS inbox retention', () => {
 
       expect(client.destroyed).toBe(false)
       expect(client.listenerCount('error')).toBe(1)
-      expect(client.listenerCount('timeout')).toBe(0)
 
       const socketError = new Error('post-connect failure')
       client.emit('error', socketError)
diff --git a/src/utils/udsClient.ts b/src/utils/udsClient.ts
index c282c2326..c0a32f721 100644
--- a/src/utils/udsClient.ts
+++ b/src/utils/udsClient.ts
@@ -280,13 +280,14 @@ export function connectToPeer(
   return new Promise<Socket>((resolve, reject) => {
     const conn = createConnection(socketPath)
     let settled = false
-    const onTimeout = () => {
-      fail(new Error('Connection timed out'))
-    }
+    const timeout = setTimeout(
+      fail,
+      timeoutMs,
+      new Error('Connection timed out'),
+    )
     function cleanupListeners(): void {
-      conn.setTimeout(0)
+      clearTimeout(timeout)
       conn.off('error', fail)
-      conn.off('timeout', onTimeout)
     }
     function fail(cause: unknown): void {
       if (settled) {
@@ -307,8 +308,6 @@ export function connectToPeer(
       resolve(conn)
     })
     conn.on('error', fail)
-    conn.once('timeout', onTimeout)
-    conn.setTimeout(timeoutMs)
   })
 }