diff --git a/lib/ns/client.c b/lib/ns/client.c
index eb1f3a3625..d9194fe702 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -871,7 +871,7 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 		/*
 		 * SERVFAIL caching: store qname/qtype of failed queries
 		 */
-		isc_time_t expire;
+/*		isc_time_t expire;
 		isc_interval_t i;
 		uint32_t flags = 0;
 
@@ -885,7 +885,7 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 					 client->query.qname,
 					 client->query.qtype,
 					 true, flags, &expire);
-		}
+		} */
 	}
 
 	ns_client_send(client);
diff --git a/lib/ns/query.c b/lib/ns/query.c
index f5ddfcb88e..7f568688a2 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -6116,10 +6116,11 @@ ns__query_sfcache(query_ctx_t *qctx) {
 					  &qctx->client->tnow);
 	}
 #else
-	failcache = dns_badcache_find(qctx->view->failcache,
+/*	failcache = dns_badcache_find(qctx->view->failcache,
 				      qctx->client->query.qname,
 				      qctx->qtype, &flags,
-				      &qctx->client->tnow);
+				      &qctx->client->tnow); */
+	failcache = false;
 #endif
 	if (failcache &&
 	    (((flags & NS_FAILCACHE_CD) != 0) ||