diff --git a/framework/core/src/Http/Middleware/HandleErrors.php b/framework/core/src/Http/Middleware/HandleErrors.php
index d7302332c..45b087b03 100644
--- a/framework/core/src/Http/Middleware/HandleErrors.php
+++ b/framework/core/src/Http/Middleware/HandleErrors.php
@@ -85,7 +85,11 @@ class HandleErrors
         // Log the exception (with trace)
         $this->logger->debug($error);
 
-        $view = $this->view->make('flarum::error')->with('error', $error);
+        if (! $this->view->exists($name = 'flarum::error.'.$status)) {
+            $name = 'flarum::error.default';
+        }
+
+        $view = $this->view->make($name)->with('error', $error);
 
         return new HtmlResponse($view->render(), $status);
     }
diff --git a/framework/core/views/error/404.blade.php b/framework/core/views/error/404.blade.php
new file mode 100644
index 000000000..e54955574
--- /dev/null
+++ b/framework/core/views/error/404.blade.php
@@ -0,0 +1,12 @@
+@extends('flarum.forum::layouts.basic')
+
+@section('content')
+  <p>
+    {{ $translator->trans('core.views.error.404_message') }}
+  </p>
+  <p>
+    <a href="{{ $app->url() }}">
+      {{ $translator->trans('core.views.error.404_return_link', ['{forum}' => $settings->get('forum_title')]) }}
+    </a>
+  </p>
+@endsection
diff --git a/framework/core/views/error.blade.php b/framework/core/views/error/default.blade.php
similarity index 100%
rename from framework/core/views/error.blade.php
rename to framework/core/views/error/default.blade.php
diff --git a/framework/core/views/layouts/basic.blade.php b/framework/core/views/layouts/basic.blade.php
index 7143e24c9..dcaa72d16 100644
--- a/framework/core/views/layouts/basic.blade.php
+++ b/framework/core/views/layouts/basic.blade.php
@@ -34,6 +34,7 @@
         cursor: pointer;
         color: {{ $primaryColor }};
         text-decoration: none;
+        font-weight: bold;
       }
       a:hover {
         text-decoration: underline;