diff --git a/resources/js/pages/errors/404.vue b/resources/js/pages/errors/404.vue
index 75012e5d2dc..7643c24dcc5 100644
--- a/resources/js/pages/errors/404.vue
+++ b/resources/js/pages/errors/404.vue
@@ -1,5 +1,10 @@
 <script setup>
-import { Card, Heading, Description } from '@ui';
+import { Card, Heading, Description, Button } from '@ui';
+import Blank from '@/pages/layout/Blank.vue';
+import useBodyClasses from '@/pages/layout/body-classes.js';
+
+defineOptions({ layout: Blank });
+useBodyClasses('bg-gray-50 dark:bg-gray-900');
 </script>
 
 <template>
@@ -7,6 +12,7 @@ import { Card, Heading, Description } from '@ui';
         <Card class="text-center flex flex-col items-center space-y-2">
             <Heading size="2xl" :text="__('404')" />
             <Description :text="__('The page you are looking for could not be found.')" />
+            <Button as="a" :href="cp_url('/')" size="xs" variant="filled" class="mt-4" :text="__('Return to Control Panel')" />
         </Card>
     </div>
 </template>
diff --git a/resources/js/pages/errors/Error.vue b/resources/js/pages/errors/Error.vue
index 315e91cedf4..2750500e04a 100644
--- a/resources/js/pages/errors/Error.vue
+++ b/resources/js/pages/errors/Error.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { Card, Heading, Description } from '@ui';
+import { Card, Heading, Description, Button } from '@ui';
 import Blank from '@/pages/layout/Blank.vue';
 import useBodyClasses from '@/pages/layout/body-classes.js';
 
@@ -13,6 +13,7 @@ useBodyClasses('bg-gray-50 dark:bg-gray-900');
         <Card class="text-center flex flex-col items-center space-y-2">
             <Heading size="2xl" :text="__('Whoops!')" />
             <Description :text="`${__('Something went wrong')} (${status})`" />
+            <Button as="a" :href="cp_url('/')" size="xs" variant="filled" class="mt-4" :text="__('Return to Control Panel')" />
         </Card>
     </div>
 </template>
diff --git a/src/Exceptions/Concerns/RendersHttpExceptions.php b/src/Exceptions/Concerns/RendersHttpExceptions.php
index dfab380e3fe..53b9121c964 100644
--- a/src/Exceptions/Concerns/RendersHttpExceptions.php
+++ b/src/Exceptions/Concerns/RendersHttpExceptions.php
@@ -6,7 +6,9 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Inertia\Inertia;
+use Statamic\Exceptions\AuthenticationException;
 use Statamic\Facades\Cascade;
+use Statamic\Facades\User;
 use Statamic\Statamic;
 use Statamic\StaticCaching\Cacher;
 use Statamic\StaticCaching\Cachers\ApplicationCacher;
@@ -23,6 +25,10 @@ public function render(Request $request)
         }
 
         if (Statamic::isCpRoute()) {
+            if (! User::current()) {
+                return (new AuthenticationException)->toResponse($request);
+            }
+
             return Inertia::render('errors/'.$this->getStatusCode())
                 ->toResponse(request())
                 ->setStatusCode($this->getStatusCode());
diff --git a/tests/Routing/RouteBindingTest.php b/tests/Routing/RouteBindingTest.php
index dc645104b33..665415ac3a6 100644
--- a/tests/Routing/RouteBindingTest.php
+++ b/tests/Routing/RouteBindingTest.php
@@ -129,6 +129,8 @@ public function binds_route_parameters_in_statamic_routes(
     ) {
         $this->setupContent();
 
+        $this->actingAs(tap(Facades\User::make()->makeSuper())->save());
+
         $response = $this->get($uri);
 
         if ($expectationCallback) {
@@ -148,6 +150,8 @@ public function binds_route_parameters_in_statamic_routes_with_bindings_disabled
     ) {
         $this->setupContent();
 
+        $this->actingAs(tap(Facades\User::make()->makeSuper())->save());
+
         $response = $this->get($uri);
 
         if ($expectationCallback) {