diff --git a/assets/controllers/404Buttons_controller.js b/assets/controllers/404Buttons_controller.js
index 32d535df8ae2a06a8133d77e94e991f47a789128..804e9e19352c747738e1593c2419dfe0018ebffb 100644
--- a/assets/controllers/404Buttons_controller.js
+++ b/assets/controllers/404Buttons_controller.js
@@ -39,7 +39,7 @@ export default class extends Controller {
         }
 
         redButton.onclick = () => {
-            location.href = "https://jonasled.de";
+            location.href = "/";
         }
 
 
diff --git a/src/Controller/PageController.php b/src/Controller/PageController.php
index 25b9f44c493129c1a334739bb560e20fa28ad775..0cb36faa88091c234ae9d94214ec6758dd6caf71 100644
--- a/src/Controller/PageController.php
+++ b/src/Controller/PageController.php
@@ -41,7 +41,7 @@ class PageController extends AbstractController
     ): Response {
         $page = $pageRepository->getPageFromURL($request->getPathInfo());
         if (!$page) {
-            throw $this->createNotFoundException();
+            return $this->render('pages/error404.html.twig')->setStatusCode(404);
         }
 
         if (!$captchaService->validate((string)$request->request->get('captcha'))) {