diff --git a/packages/reffuse/src/ReffuseNamespace.ts b/packages/reffuse/src/ReffuseNamespace.ts
index 6c637eb..9f43f92 100644
--- a/packages/reffuse/src/ReffuseNamespace.ts
+++ b/packages/reffuse/src/ReffuseNamespace.ts
@@ -489,9 +489,9 @@ export abstract class ReffuseNamespace<R> {
             Effect.provideService(Scope.Scope, scope),
         ), [scope])
 
-        this.useEffect(() => Effect.andThen(
-            Ref.set(latest, values),
-            PubSub.publish(pubsub, values),
+        this.useEffect(() => Ref.set(latest, values).pipe(
+            Effect.andThen(PubSub.publish(pubsub, values)),
+            Effect.unlessEffect(PubSub.isShutdown(pubsub)),
         ), values)
 
         return stream
diff --git a/packages/reffuse/src/tests.ts b/packages/reffuse/src/tests.ts
deleted file mode 100644
index c5c9791..0000000
--- a/packages/reffuse/src/tests.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Console, Effect, Fiber, Ref, Stream, SubscriptionRef } from "effect"
-
-
-await Effect.gen(function*() {
-    const ref = yield* SubscriptionRef.make("juif")
-    const stream = ref.changes
-
-    const f1 = yield* Stream.runForEach(stream, v => Console.log(`observer 1: ${ v }`)).pipe(
-        Effect.fork,
-    )
-    const f2 = yield* Effect.sleep("200 millis").pipe(
-        Effect.andThen(Stream.runForEach(stream, v => Console.log(`observer 2: ${ v }`))),
-        Effect.fork,
-    )
-    const f3 = yield* Effect.sleep("100 millis").pipe(
-        Effect.andThen(Ref.set(ref, "adolf")),
-        Effect.fork,
-    )
-
-    yield* Fiber.joinAll([f1, f2, f3])
-}).pipe(
-    Effect.runPromise
-)