diff --git a/CHANGES b/CHANGES
index c349fbd5d9..c32cc41301 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2266.	[bug]		client.c:get_clientmctx() returned the same mctx
+			once the pool of mctx's was filled. [RT #17218]
+
 2265.	[bug]		Test that the memory context's basic_table is non NULL
 			before freeing.  [RT #17265]
 
diff --git a/bin/named/client.c b/bin/named/client.c
index de49512a85..df98201cc8 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.249 2007/08/22 00:42:42 marka Exp $ */
+/* $Id: client.c,v 1.250 2007/11/26 04:47:17 marka Exp $ */
 
 #include <config.h>
 
@@ -1853,10 +1853,10 @@ get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) {
 			return (result);
 
 		manager->mctxpool[manager->nextmctx] = clientmctx;
-		manager->nextmctx++;
-		if (manager->nextmctx == NMCTXS)
-			manager->nextmctx = 0;
 	}
+	manager->nextmctx++;
+	if (manager->nextmctx == NMCTXS)
+		manager->nextmctx = 0;
 #else
 	clientmctx = manager->mctx;
 #endif