diff --git a/lib/ns/query.c b/lib/ns/query.c
index 8edfc9814c..0b3d359d17 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -9870,6 +9870,12 @@ query_synthcnamewildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset,
 	RUNTIME_CHECK(result == ISC_R_SUCCESS);
 	dns_rdata_reset(&rdata);
 
+	if (dns_name_equal(qctx->client->query.qname, &cname.cname)) {
+		dns_message_puttempname(qctx->client->message, &tname);
+		dns_rdata_freestruct(&cname);
+		return (ISC_R_SUCCESS);
+	}
+
 	dns_name_copy(&cname.cname, tname);
 
 	dns_rdata_freestruct(&cname);