diff --git a/packages/core/src/location-mutation.ts b/packages/core/src/location-mutation.ts
index cc4e93781ab..199d791db59 100644
--- a/packages/core/src/location-mutation.ts
+++ b/packages/core/src/location-mutation.ts
@@ -125,6 +125,6 @@ const layer = Layer.effect(
 
 export const node = makeLocationNode({
   service: Service,
-  layer: layer.pipe(Layer.orDie),
+  layer,
   deps: [FSUtil.node, Location.node, ProjectMarkers.node],
 })
diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
index e58d111d32a..a5478881c30 100644
--- a/packages/core/src/session.ts
+++ b/packages/core/src/session.ts
@@ -1209,7 +1209,7 @@ const SHELL_MAX_CAPTURE_BYTES = 1024 * 1024
 
 export const node = makeGlobalNode({
   service: Service,
-  layer: layer.pipe(Layer.orDie),
+  layer,
   deps: [
     Job.node,
     SessionEnvironment.node,