diff --git a/doc/notes/notes-9.18.36.rst b/doc/notes/notes-9.18.36.rst
index ddf4bc9f8b..458d3d9599 100644
--- a/doc/notes/notes-9.18.36.rst
+++ b/doc/notes/notes-9.18.36.rst
@@ -48,3 +48,10 @@ Bug Fixes
   the DNSKEY implementation was built on top of KEY, the ``_NOAUTH``
   flag prevented authentication in DNSKEYs as well. This has been
   corrected. :gl:`#5240`
+
+- Fix inconsistency in CNAME/DNAME handling during resolution.
+
+  Previously, in some cases, the resolver could return rdatasets of type
+  CNAME or DNAME without the result code being set to ``DNS_R_CNAME`` or
+  ``DNS_R_DNAME``. This could trigger an assertion failure. This has
+  been fixed. :gl:`#5201`