diff --git a/CHANGES b/CHANGES
index 2093d52eb8..e446dd9a41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+5610.	[bug]		Prevent a crash which could happen when a lookup
+			triggered by "stale-answer-client-timeout" was attempted
+			right after recursion for a client query finished.
+			[GL #2594]
+
 5609.	[func]		GSSAPI support no longer uses the ISC SPNEGO
 			implementation. [GL #2607]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index c43b733c9d..1758bbdd47 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -64,4 +64,9 @@ Bug Fixes
   which could cause a large zone transfer to be sent back to the client. The
   default setting for ``tcp-initial-timeout`` was 30 seconds, which meant that
   any TCP connection taking more than 30 seconds was abruptly terminated. This
-  has been fixed [GL #2573].
+  has been fixed. [GL #2573]
+
+- When ``stale-answer-client-timeout`` was set to a positive value and
+  recursion for a client query completed when ``named`` was about to look for
+  a stale answer, an assertion could fail in ``query_respond()``, resulting in
+  a crash. This has been fixed. [GL #2594]