diff --git a/src/client.ts b/src/client.ts
index fe26cd44..e27d5b99 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -346,7 +346,9 @@ export function createClient(options: ClientOptions): Client {
       waitForReleaseOrThrowOnClose: Promise<void>,
     ]
   > {
-    locks++;
+    // locks increment only when not retrying because
+    // the same lock retries connect on abrupt closures
+    if (!retrying) locks++;
 
     const [socket, throwOnClose] = await (connecting ??
       (connecting = new Promise<Connected>((connected, denied) =>
diff --git a/src/tests/client.ts b/src/tests/client.ts
index 21a1da36..77ec2f57 100644
--- a/src/tests/client.ts
+++ b/src/tests/client.ts
@@ -983,6 +983,43 @@ describe('reconnecting', () => {
   it.todo(
     'should attempt reconnecting silently a few times before closing for good',
   );
+
+  it('should lazy disconnect after retries when all subscriptions are completed', async () => {
+    const { url, ...server } = await startTServer();
+
+    const client = createClient({
+      url,
+      lazy: true, // behavior on lazy only
+      retryAttempts: Infinity, // keep retrying forever
+      retryWait: () => Promise.resolve(),
+    });
+
+    const sub = tsubscribe(client, {
+      query: 'subscription { ping }',
+    });
+
+    await server.waitForClient((client) => client.close());
+    await server.waitForClientClose();
+
+    await server.waitForClient((client) => client.close());
+    await server.waitForClientClose();
+
+    await server.waitForClient((client) => client.close());
+    await server.waitForClientClose();
+
+    // allow sub on the 3rd retry
+    await server.waitForOperation();
+
+    // dispose of the last and only subscription
+    sub.dispose();
+    await sub.waitForComplete();
+
+    // client should now leave
+    await server.waitForClientClose();
+
+    // and no clients should be left
+    expect(server.clients.size).toBe(0);
+  });
 });
 
 describe('events', () => {