diff --git a/doc/Changelog b/doc/Changelog
index 14955de93..a3b36d8c7 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 7 August 2025: Wouter
 	- Fix dname_str for printout of long names. Thanks to Jan Komissar
 	  for the fix.
+	- Fix that edns-subnet failure to create a subquery errors as
+	  servfail, and not formerror.
 
 6 August 2025: Wouter
 	- Fix edns subnet, so that the subquery without subnet is stored in
diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index 6f71129d9..88310a785 100644
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -608,7 +608,7 @@ generate_lookup_without_subnet(struct module_qstate *qstate, int id,
 	verbose(VERB_ALGO, "subnetcache: make subquery to look up without subnet");
 	if(!generate_sub_request(qstate, id, sq)) {
 		verbose(VERB_ALGO, "Could not generate sub query");
-		qstate->return_rcode = LDNS_RCODE_FORMERR;
+		qstate->return_rcode = LDNS_RCODE_SERVFAIL;
 		qstate->return_msg = NULL;
 		return module_finished;
 	}