diff --git a/src/Client.ts b/src/Client.ts
index 296cc56..6ae8ece 100644
--- a/src/Client.ts
+++ b/src/Client.ts
@@ -97,6 +97,7 @@ export class Client<E extends Emitter = Emitter> extends Root {
         batch.push(message);
       }
       if (batch.length > 0) listener.emit(eventName, batch);
+      events.stop();
     }
   }
 
diff --git a/src/__tests__/Client.ts b/src/__tests__/Client.ts
index da6f05d..6ca5d76 100644
--- a/src/__tests__/Client.ts
+++ b/src/__tests__/Client.ts
@@ -96,8 +96,11 @@ describe('Testing Client class methods', () => {
     test('Successful fetch events from stream', done => {
       const payload = { data: { elapsed: 42 } };
       const subscribe = new PassThrough({ objectMode: true });
+      const secondSubscribe = new PassThrough({ objectMode: true });
+      subscribe['stop'] = jest.fn();
+      secondSubscribe['stop'] = jest.fn();
       jetstreamFetchMock.mockReturnValueOnce(subscribe);
-      jetstreamFetchMock.mockReturnValueOnce(new PassThrough({ objectMode: true }));
+      jetstreamFetchMock.mockReturnValueOnce(secondSubscribe);
 
       const result = mathClient.getListener('Test', { batch: true });