diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 21cc5bfbec..cc35b917c7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -25,6 +25,7 @@ Changelog
  * Fix: Password reset no indicates specific validation errors on certain password restrictions (Lucas Moeskops)
  * Fix: Confirmation page on page deletion now respects custom `get_admin_display_title` methods (Kim Chee Leong)
  * Fix: Adding external link with selected text now includes text in link chooser (Tony Yates, Thibaud Colas, Alexs Mathilda)
+ * Fix: Editing setting object with no site configured no longer crashes (Harm Zeinstra)
 
 
 2.0.1 (xx.xx.xxxx) - IN DEVELOPMENT
diff --git a/docs/releases/2.1.rst b/docs/releases/2.1.rst
index 55b260b2b1..eeb09a3db0 100644
--- a/docs/releases/2.1.rst
+++ b/docs/releases/2.1.rst
@@ -43,6 +43,7 @@ Bug fixes
  * Password reset no indicates specific validation errors on certain password restrictions (Lucas Moeskops)
  * Confirmation page on page deletion now respects custom ``get_admin_display_title`` methods (Kim Chee Leong)
  * Adding external link with selected text now includes text in link chooser (Tony Yates, Thibaud Colas, Alexs Mathilda)
+ * Editing setting object with no site configured no longer crashes (Harm Zeinstra)
 
 
 Upgrade considerations