diff --git a/docs/overrides/404.html b/docs/overrides/404.html
new file mode 100644
index 000000000..b8c7aa65b
--- /dev/null
+++ b/docs/overrides/404.html
@@ -0,0 +1,11 @@
+{% extends "main.html" %}
+
+<!-- Content -->
+{% block content %}
+  <h1>404 - Not found</h1>
+  <br>
+  FlatBuffers is currently migrating their documentation system and existing 
+  links may not work. 
+  
+  Please <a href="https://github.com/google/flatbuffers/issues/new?template=404-doc.md">file an issue</a> indicating the broken link.
+  {% endblock %}
\ No newline at end of file
diff --git a/docs/overrides/main.html b/docs/overrides/main.html
index b97ab3d6c..d2f24534a 100644
--- a/docs/overrides/main.html
+++ b/docs/overrides/main.html
@@ -2,5 +2,5 @@
 
 <!-- Announcement bar -->
 {% block announce %}
-  View old documentation at <a href="https://dbaileychess.github.io/flatbuffers">https://dbaileychess.github.io/flatbuffers</a>
+  Documentation migration in progress, view snapshot of the old documentation <a href="https://dbaileychess.github.io/flatbuffers">here.</a>
 {% endblock %}
\ No newline at end of file