diff --git a/app/Http/Controllers/ScenarioController.php b/app/Http/Controllers/ScenarioController.php
index 0ee5f2e..61784ba 100644
--- a/app/Http/Controllers/ScenarioController.php
+++ b/app/Http/Controllers/ScenarioController.php
@@ -44,7 +44,7 @@ public function show(Scenario $scenario): Response
         }]);
 
         return Inertia::render('Scenarios/Show', [
-            'scenario' => new ScenarioResource($scenario),
+            'scenario' => ScenarioResource::make($scenario)->resolve(),
             'buckets' => BucketResource::collection($scenario->buckets),
             'streams' => StreamResource::collection($this->streamRepository->getForScenario($scenario)),
             'streamStats' => $this->statsService->getSummaryStats($scenario),
@@ -66,7 +66,7 @@ public function store(StoreScenarioRequest $request): RedirectResponse
     public function edit(Scenario $scenario): Response
     {
         return Inertia::render('Scenarios/Edit', [
-            'scenario' => new ScenarioResource($scenario),
+            'scenario' => ScenarioResource::make($scenario)->resolve(),
         ]);
     }
 
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index a1fbd1f..e536aea 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -48,7 +48,7 @@ public function share(Request $request): array
                 'user' => $request->user(),
             ],
             'sidebarOpen' => ! $request->hasCookie('sidebar_state') || $request->cookie('sidebar_state') === 'true',
-            'scenario' => fn () => ($scenario = Scenario::first()) ? new ScenarioResource($scenario) : null,
+            'scenario' => fn () => ($scenario = Scenario::first()) ? ScenarioResource::make($scenario)->resolve() : null,
         ];
     }
 }