diff --git a/src/__tests__/client.ts b/src/__tests__/client.ts
index 9865980..a24d96d 100644
--- a/src/__tests__/client.ts
+++ b/src/__tests__/client.ts
@@ -155,40 +155,6 @@ it('should report error to sink if server goes away', async () => {
   );
 });
 
-it('should respect retry attempts when server goes away after connecting', async () => {
-  const { fetch, waitForRequest, dispose } = createTFetch();
-
-  const client = createClient({
-    fetchFn: fetch,
-    url: 'http://localhost',
-    retryAttempts: 2,
-    retry: () => Promise.resolve(),
-  });
-
-  const sub = tsubscribe(client, {
-    query: `subscription { ping(key: "${Math.random()}") }`,
-  });
-
-  // start
-  await waitForRequest();
-  await dispose();
-
-  // 1st retry
-  await waitForRequest();
-  await dispose();
-
-  // 2nd retry
-  await waitForRequest();
-  await dispose();
-
-  // no more retries
-  await expect(
-    Promise.race([waitForRequest(), sub.waitForError()]),
-  ).resolves.toMatchInlineSnapshot(
-    `[NetworkError: Connection closed while having active streams]`,
-  );
-});
-
 it('should report error to sink if server goes away during generator emission', async () => {
   const { fetch, dispose } = createTFetch();
 
@@ -384,6 +350,47 @@ describe('single connection mode', () => {
       expect(stream.signal.aborted).toBeTruthy();
     });
   });
+
+  it('should respect retry attempts when server goes away after connecting', async () => {
+    const { fetch, waitForRequest, dispose } = createTFetch();
+
+    const client = createClient({
+      singleConnection: true,
+      fetchFn: fetch,
+      url: 'http://localhost',
+      retryAttempts: 2,
+      retry: () => Promise.resolve(),
+    });
+
+    const sub = tsubscribe(client, {
+      query: `subscription { ping(key: "${Math.random()}") }`,
+    });
+
+    // start
+    await waitForRequest(); // reservation
+    await waitForRequest(); // connect
+    await waitForRequest(); // operation
+    await dispose();
+
+    // 1st retry
+    await waitForRequest(); // reservation
+    await waitForRequest(); // connect
+    await waitForRequest(); // operation
+    await dispose();
+
+    // 2nd retry
+    await waitForRequest(); // reservation
+    await waitForRequest(); // connect
+    await waitForRequest(); // operation
+    await dispose();
+
+    // no more retries
+    await expect(
+      Promise.race([waitForRequest(), sub.waitForError()]),
+    ).resolves.toMatchInlineSnapshot(
+      `[NetworkError: Connection closed while having active streams]`,
+    );
+  });
 });
 
 describe('distinct connections mode', () => {
@@ -468,6 +475,41 @@ describe('distinct connections mode', () => {
     expect(stream1.signal.aborted).toBeTruthy();
     expect(stream2.signal.aborted).toBeTruthy();
   });
+
+  it('should respect retry attempts when server goes away after connecting', async () => {
+    const { fetch, waitForRequest, dispose } = createTFetch();
+
+    const client = createClient({
+      singleConnection: false,
+      fetchFn: fetch,
+      url: 'http://localhost',
+      retryAttempts: 2,
+      retry: () => Promise.resolve(),
+    });
+
+    const sub = tsubscribe(client, {
+      query: `subscription { ping(key: "${Math.random()}") }`,
+    });
+
+    // start
+    await waitForRequest();
+    await dispose();
+
+    // 1st retry
+    await waitForRequest();
+    await dispose();
+
+    // 2nd retry
+    await waitForRequest();
+    await dispose();
+
+    // no more retries
+    await expect(
+      Promise.race([waitForRequest(), sub.waitForError()]),
+    ).resolves.toMatchInlineSnapshot(
+      `[NetworkError: Connection closed while having active streams]`,
+    );
+  });
 });
 
 describe('retries', () => {
diff --git a/src/client.ts b/src/client.ts
index 87166ff..bf281e7 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -376,8 +376,6 @@ export function createClient<SingleConnection extends boolean = false>(
             fetchFn,
             onMessage,
           });
-          retryingErr = null; // future connects are not retries
-          retries = 0; // reset the retries on connect
 
           connected.waitForThrow().catch(() => (conn = undefined));
 
@@ -577,6 +575,14 @@ export function createClient<SingleConnection extends boolean = false>(
               signal: control.signal,
               operationId,
             })) {
+              // only after receiving results are future connects not considered retries.
+              // this is because a client might successfully connect, but the server
+              // ends up terminating the connection afterwards before streaming anything.
+              // of course, if the client completes the subscription, this loop will
+              // break and therefore stop the stream (it wont reconnect)
+              retryingErr = null;
+              retries = 0;
+
               // eslint-disable-next-line @typescript-eslint/no-explicit-any
               sink.next(result as any);
             }