diff --git a/packages/server/src/client.js b/packages/server/src/client.js
index 3039e59..5b97bf3 100644
--- a/packages/server/src/client.js
+++ b/packages/server/src/client.js
@@ -57,12 +57,13 @@ export function _genericClientSessionFacet(addr, scope, w0, debug) {
 
   const outboundTurn = recorder(this, 'commitNeeded', (items) => w(Turn(items)));
 
-  on start w(Connect(scope));
-
   let pubs = Map();
   let subs = Map();
   let matches = Map();
 
+  on start w(Connect(scope));
+  on stop matches.forEach((m) => m.captures.forEach((a) => currentFacet().actor.adhocRetract(a)));
+
   on asserted ToServer(addr, $a) {
     const ep = genUuid('pub');
     outboundTurn.extend(Assert(ep, a));