diff --git a/bin/named/query.c b/bin/named/query.c
index 5555ab4f35..6172e26d01 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1156,6 +1156,8 @@ query_find(ns_client_t *client) {
 				 * Add SOA.
 				 */
 				result = query_addsoa(client, db);
+				if (result == ISC_R_SUCCESS)
+					result = DNS_R_NOMORE;
 			} else {
 				/*
 				 * Something went wrong.