diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 13654c3224..ec6b8d1394 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ Changelog
 3.0.1 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~~~
 
+ * Add warning when `WAGTAILADMIN_BASE_URL` is not configured (Matt Westcott)
  * Fix: Ensure `TabbedInterface` will not show a tab if no panels are visible due to permissions (Paarth Agarwal)
  * Fix: Specific snippets list language picker was not properly styled (Sage Abdullah)
  * Fix: Ensure the upgrade notification request for the latest release, which can be disabled via the `WAGTAIL_ENABLE_UPDATE_CHECK` sends the referrer origin with `strict-origin-when-cross-origin` (Karl Hobley)
@@ -11,6 +12,8 @@ Changelog
  * Fix: Ensure radio buttons / checkboxes display vertically under Django 4.0 (Matt Westcott)
  * Fix: Prevent failures when splitting blocks at the start or end of a block, or with highlighted text (Jacob Topp-Mugglestone)
  * Fix: Allow scheduled publishing to complete when the initial editor did not have publish permission (Matt Westcott)
+ * Fix: Stop emails from breaking when `WAGTAILADMIN_BASE_URL` is absent due to the request object not being available (Matt Westcott)
+ * Fix: Make try/except on sending email less broad so that legitimate template rendering errors are exposed (Matt Westcott)
 
 
 3.0 (16.05.2022)
diff --git a/docs/releases/3.0.1.md b/docs/releases/3.0.1.md
index 90983ae682..5bb2e60cca 100644
--- a/docs/releases/3.0.1.md
+++ b/docs/releases/3.0.1.md
@@ -9,6 +9,9 @@ depth: 1
 
 ## What's new
 
+### Other features
+ * Add warning when `WAGTAILADMIN_BASE_URL` is not configured (Matt Westcott)
+
 ### Bug fixes
 
  * Ensure `TabbedInterface` will not show a tab if no panels are visible due to permissions (Paarth Agarwal)
@@ -18,3 +21,5 @@ depth: 1
  * Ensure radio buttons / checkboxes display vertically under Django 4.0 (Matt Westcott)
  * Prevent failures when splitting blocks at the start or end of a block, or with highlighted text (Jacob Topp-Mugglestone)
  * Allow scheduled publishing to complete when the initial editor did not have publish permission (Matt Westcott)
+ * Stop emails from breaking when `WAGTAILADMIN_BASE_URL` is absent due to the request object not being available (Matt Westcott)
+ * Make try/except on sending email less broad so that legitimate template rendering errors are exposed (Matt Westcott)