diff --git a/Taskfile.yml b/Taskfile.yml
index 12753ca..34a7367 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -38,7 +38,7 @@ tasks:
     deps:
       - deps/patch
     cmds:
-      - pushd mkdocs && uv run mkdocs serve
+      - pushd mkdocs && uv run mkdocs serve --watch-theme
 
   ##
   ## Testing and Linting
diff --git a/docs/stylesheets/custom.css b/docs/stylesheets/custom.css
index 5101bdc..954517f 100644
--- a/docs/stylesheets/custom.css
+++ b/docs/stylesheets/custom.css
@@ -165,11 +165,6 @@ html [data-md-color-primary=black] .md-nav--primary .md-nav__title[for=__drawer]
    404 page (Material override)
 ---------------------------------------------------------------------------- */
 
-body:has(.agntcy-not-found) .md-sidebar--primary,
-body:has(.agntcy-not-found) .md-sidebar--secondary {
-  display: none;
-}
-
 body:has(.agntcy-not-found) .md-content {
   max-width: none;
 }
diff --git a/mkdocs/overrides/404.html b/mkdocs/overrides/404.html
index 3524f86..5795c36 100644
--- a/mkdocs/overrides/404.html
+++ b/mkdocs/overrides/404.html
@@ -2,7 +2,17 @@
   Copyright AGNTCY Contributors (https://github.com/agntcy)
   SPDX-License-Identifier: Apache-2.0
 -#}
-{% extends "main.html" %}
+{% extends "base.html" %}
+{% block htmltitle %}
+  <title>Page not found — {{ config.site_name }}</title>
+{% endblock %}
+{% block extrahead %}
+  <meta name="robots" content="noindex">
+{% endblock %}
+{% block site_nav %}{% endblock %}
+{% block footer %}
+  {% include "partials/footer.html" %}
+{% endblock %}
 {% block content %}
   <div class="agntcy-not-found">
     <p class="agntcy-not-found__code" aria-hidden="true">404</p>