From cc01e46997cbb4ab8bec5bde00239c52552408fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sun, 19 Jul 2026 18:55:01 +0200
Subject: [PATCH] Fix runtime

---
 packages/effect-fc-next/src/ReactRuntime.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/effect-fc-next/src/ReactRuntime.ts b/packages/effect-fc-next/src/ReactRuntime.ts
index 29c738a..0cee1e0 100644
--- a/packages/effect-fc-next/src/ReactRuntime.ts
+++ b/packages/effect-fc-next/src/ReactRuntime.ts
@@ -46,11 +46,6 @@ export namespace Provider {
 export const Provider = <R, ER>(
     { runtime, children, ...suspenseProps }: Provider.Props<R, ER>
 ): React.ReactNode => {
-    Effect.runSync(Component.useOnChange(
-        () => Effect.addFinalizer(() => runtime.runtime.disposeEffect),
-        [runtime],
-    ))
-
     const promise = React.useMemo(() => runtime.runtime.context(), [runtime])
 
     return React.createElement(
@@ -66,4 +61,12 @@ const ProviderInner = <R, ER>(
         readonly promise: Promise<Context.Context<R>>
         readonly children?: React.ReactNode
     }
-): React.ReactNode => React.createElement(runtime.context, { value: React.use(promise) }, children)
+): React.ReactNode => {
+    const context = React.use(promise)
+    Effect.runSyncWith(context)(Component.useOnChange(
+        () => Effect.addFinalizer(() => runtime.runtime.disposeEffect),
+        [runtime],
+    ))
+
+    return React.createElement(runtime.context, { value: context }, children)
+}