diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index 3bf45645..578ed531 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -165,26 +165,19 @@ class HandleInertiaRequests extends Middleware
     {
         $user = request()->user();
 
-        if (! $user) {
-            return [
-                'cashflow' => true,
-                'calculateBalancesOnImport' => false,
-                'customMonthStartDay' => false,
-                'transactionAnalysis' => false,
-            ];
-        }
-
-        $features = Feature::for($user)->values([
-            CalculateBalancesOnImport::class,
-            CustomMonthStartDay::class,
-            TransactionAnalysis::class,
-        ]);
+        $flags = $user
+            ? Feature::for($user)->values([
+                CalculateBalancesOnImport::class,
+                CustomMonthStartDay::class,
+                TransactionAnalysis::class,
+            ])
+            : [];
 
         return [
             'cashflow' => true,
-            'calculateBalancesOnImport' => $features[CalculateBalancesOnImport::class] !== false,
-            'customMonthStartDay' => $features[CustomMonthStartDay::class] !== false,
-            'transactionAnalysis' => $features[TransactionAnalysis::class] !== false,
+            'calculateBalancesOnImport' => $flags[CalculateBalancesOnImport::class] ?? false,
+            'customMonthStartDay' => $flags[CustomMonthStartDay::class] ?? false,
+            'transactionAnalysis' => $flags[TransactionAnalysis::class] ?? false,
         ];
     }
 
diff --git a/tests/Feature/InertiaSharedDataTest.php b/tests/Feature/InertiaSharedDataTest.php
index a9b54856..898ac906 100644
--- a/tests/Feature/InertiaSharedDataTest.php
+++ b/tests/Feature/InertiaSharedDataTest.php
@@ -43,6 +43,7 @@ test('shared feature flags do not include coinbase flag', function () {
     expect($props['features'])->toBe([
         'cashflow' => true,
         'calculateBalancesOnImport' => false,
+        'customMonthStartDay' => false,
         'transactionAnalysis' => false,
     ]);
 });