diff --git a/apps/server/src/persistence/NodeSqliteClient.ts b/apps/server/src/persistence/NodeSqliteClient.ts
index 77c316e8ca..bd760eccf1 100644
--- a/apps/server/src/persistence/NodeSqliteClient.ts
+++ b/apps/server/src/persistence/NodeSqliteClient.ts
@@ -8,6 +8,7 @@ import { DatabaseSync, type StatementSync } from "node:sqlite";
 
 import * as Cache from "effect/Cache";
 import * as Config from "effect/Config";
+import * as Context from "effect/Context";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
@@ -251,27 +252,21 @@ const makeMemory = (
 export const layerConfig = (
   config: Config.Wrap<SqliteClientConfig>,
 ): Layer.Layer<Client.SqlClient, Config.ConfigError> =>
-  Layer.effectServices(
+  Layer.scopedContext(
     Config.unwrap(config)
       .asEffect()
       .pipe(
         Effect.flatMap(make),
-        Effect.map((client) =>
-          ServiceMap.make(SqliteClient, client).pipe(ServiceMap.add(Client.SqlClient, client)),
-        ),
+        Effect.map((client) => Context.make(Client.SqlClient, client)),
       ),
   ).pipe(Layer.provide(Reactivity.layer));
 
 export const layer = (config: SqliteClientConfig): Layer.Layer<Client.SqlClient> =>
-  Layer.effectServices(
-    Effect.map(make(config), (client) =>
-      ServiceMap.make(SqliteClient, client).pipe(ServiceMap.add(Client.SqlClient, client)),
-    ),
+  Layer.scopedContext(
+    Effect.map(make(config), (client) => Context.make(Client.SqlClient, client)),
   ).pipe(Layer.provide(Reactivity.layer));
 
 export const layerMemory = (config: SqliteMemoryClientConfig = {}): Layer.Layer<Client.SqlClient> =>
-  Layer.effectServices(
-    Effect.map(makeMemory(config), (client) =>
-      ServiceMap.make(SqliteClient, client).pipe(ServiceMap.add(Client.SqlClient, client)),
-    ),
+  Layer.scopedContext(
+    Effect.map(makeMemory(config), (client) => Context.make(Client.SqlClient, client)),
   ).pipe(Layer.provide(Reactivity.layer));