diff --git a/__tests__/invariants.test.ts b/__tests__/invariants.test.ts
index 7779990b..b148b1df 100644
--- a/__tests__/invariants.test.ts
+++ b/__tests__/invariants.test.ts
@@ -128,20 +128,26 @@ describe('procedures should leave no trace after finishing', async () => {
     const [input, output, close] = await client.test.echo.stream();
     input.push({ msg: '1', ignore: false });
     input.push({ msg: '2', ignore: false, end: true });
-    input.end();
 
     const result1 = await iterNext(output);
     assert(result1.ok);
     expect(result1.payload).toStrictEqual({ response: '1' });
+
+    // ensure we only have one stream despite pushing multiple messages.
+    await new Promise((accept, _reject) => setTimeout(accept, 0));
+    expect(server.streams.size).toEqual(1);
+    input.end();
+    // ensure we no longer have any streams since the input was closed.
+    await new Promise((accept, _reject) => setTimeout(accept, 0));
+    expect(server.streams.size).toEqual(0);
+
     const result2 = await iterNext(output);
     assert(result2.ok);
     expect(result2.payload).toStrictEqual({ response: '2' });
 
-    // ensure we exactly have one stream even after we send multiple messages
-    expect(server.streams.size).toEqual(1);
-
     const result3 = await output.next();
     assert(result3.done);
+
     close();
     // end procedure
 
diff --git a/router/client.ts b/router/client.ts
index 9c6e7496..f32fc832 100644
--- a/router/client.ts
+++ b/router/client.ts
@@ -235,6 +235,8 @@ export const createClient = <Srv extends Server<Record<string, AnyService>>>(
 
           transport.send(m);
         }
+
+        transport.send(closeStream(transport.clientId, serverId, streamId));
       })();
 
       // transport -> output