diff --git a/lib/dns/rbt-cachedb.c b/lib/dns/rbt-cachedb.c
index c97f078c66..55fe3540e4 100644
--- a/lib/dns/rbt-cachedb.c
+++ b/lib/dns/rbt-cachedb.c
@@ -957,7 +957,9 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
 				   DNS_SIGTYPE(dns_rdatatype_nsec))
 			{
 				nsecsig = header;
-			} else if (cname_ok && DNS_SIGTYPE(dns_rdatatype_cname))
+			} else if (cname_ok &&
+				   header->type ==
+					   DNS_SIGTYPE(dns_rdatatype_cname))
 			{
 				/*
 				 * If we get a CNAME match, we'll also need