diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c
index c3b1e25acf..bc74e1f5b1 100644
--- a/lib/dns/qpcache.c
+++ b/lib/dns/qpcache.c
@@ -1540,11 +1540,6 @@ qpcache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
 	dns_slabheader_t *nsecheader = NULL, *nsecsig = NULL;
 	dns_typepair_t typepair, sigpair;
 
-	if (type == dns_rdatatype_none) {
-		/* We can't search negative cache directly */
-		return ISC_R_NOTFOUND;
-	}
-
 	qpc_search_t search;
 	qpc_search_init(&search, (qpcache_t *)db, options, __now);
 
@@ -1629,10 +1624,11 @@ qpcache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
 	/*
 	 * Certain DNSSEC types are not subject to CNAME matching
 	 * (RFC4035, section 2.5 and RFC3007).
+	 *
+	 * We don't check for RRSIG, because we don't store RRSIG records
+	 * directly.
 	 */
-	if (type == dns_rdatatype_key || type == dns_rdatatype_nsec ||
-	    type == dns_rdatatype_rrsig)
-	{
+	if (type == dns_rdatatype_key || type == dns_rdatatype_nsec) {
 		cname_ok = false;
 	}