diff --git a/CHANGES b/CHANGES
index c60beacb95..164c58faef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4640.	[bug]		If query_findversion failed in query_getdb due to
+			memory failure the error status was incorrectly
+			discarded. [RT #45331]
+
 4636.	[bug]		Normalize rpz policy zone names when checking for
 			existence. [RT #45358]
 
diff --git a/bin/named/query.c b/bin/named/query.c
index a1eeb6ea38..2bdf4c572c 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1177,7 +1177,7 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype,
 
 			dbversion = query_findversion(client, tdbp);
 			if (dbversion == NULL) {
-				result = ISC_R_NOMEMORY;
+				tresult = ISC_R_NOMEMORY;
 			} else {
 				/*
 				 * Be sure to return our database.