diff --git a/UPGRADE.rst b/UPGRADE.rst
index 55c77eedde8f..aa5473ec62e6 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -48,6 +48,15 @@ returned by the Client-Server API:
     # configured on port 443.
     curl -kv https://<host.name>/_matrix/client/versions 2>&1 | grep "Server:"
 
+Upgrading to v0.34.0
+====================
+
+This release removes the ``riot.im`` from the default list of trusted identity servers.
+
+If ``riot.im`` is in your homeserver's list of ``trusted_third_party_id_servers``,
+you should remove it. It was added in case a hypothetical future identity server was
+put there. If you don't remove it, users may be unable to deactivate their accounts.
+
 Upgrading to v0.33.7
 ====================
 
diff --git a/changelog.d/4224.misc b/changelog.d/4224.misc
new file mode 100644
index 000000000000..1bfe2e5c3159
--- /dev/null
+++ b/changelog.d/4224.misc
@@ -0,0 +1 @@
+Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers