diff --git a/lib/ns/client.c b/lib/ns/client.c
index 9900866c35..04a8da7d3e 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -235,8 +235,10 @@ ns_client_endrequest(ns_client_t *client) {
 	 */
 	if (client->recursionquota != NULL) {
 		isc_quota_detach(&client->recursionquota);
-		ns_stats_decrement(client->sctx->nsstats,
-				   ns_statscounter_recursclients);
+		if (client->query.prefetch == NULL) {
+			ns_stats_decrement(client->sctx->nsstats,
+					   ns_statscounter_recursclients);
+		}
 	}
 
 	/*
diff --git a/lib/ns/query.c b/lib/ns/query.c
index a503109db0..46f1b59c89 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -2463,6 +2463,13 @@ prefetch_done(isc_task_t *task, isc_event_t *event) {
 	}
 	UNLOCK(&client->query.fetchlock);
 
+	/*
+	 * We're done prefetching, detach from quota.
+	 */
+	if (client->recursionquota != NULL) {
+		isc_quota_detach(&client->recursionquota);
+	}
+
 	free_devent(client, &event, &devent);
 	isc_nmhandle_unref(client->handle);
 }
@@ -2488,6 +2495,9 @@ query_prefetch(ns_client_t *client, dns_name_t *qname,
 	if (client->recursionquota == NULL) {
 		result = isc_quota_attach(&client->sctx->recursionquota,
 					  &client->recursionquota);
+		if (result == ISC_R_SOFTQUOTA) {
+			isc_quota_detach(&client->recursionquota);
+		}
 		if (result != ISC_R_SUCCESS) {
 			return;
 		}
@@ -2698,6 +2708,9 @@ query_rpzfetch(ns_client_t *client, dns_name_t *qname, dns_rdatatype_t type) {
 	if (client->recursionquota == NULL) {
 		result = isc_quota_attach(&client->sctx->recursionquota,
 					  &client->recursionquota);
+		if (result == ISC_R_SOFTQUOTA) {
+			isc_quota_detach(&client->recursionquota);
+		}
 		if (result != ISC_R_SUCCESS) {
 			return;
 		}