diff --git a/CHANGES b/CHANGES
index e7d71ce5f0..2178b6a80f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3389.	[bug]		Always return NOERROR (not 0) in TSIG. [RT #31275]
+
 3388.	[bug]		Fixed several Coverity warnings. [RT #30996]
 
 3387.	[func]		DS digest can be disabled at runtime with
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 3691121ddc..1d0a836bfa 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -226,12 +226,7 @@ totext_any_tsig(ARGS_TOTEXT) {
 	 */
 	n = uint16_fromregion(&sr);
 	isc_region_consume(&sr, 2);
-	if (dns_tsigrcode_totext((dns_rcode_t)n, target) == ISC_R_SUCCESS)
-		RETERR(str_totext(" ", target));
-	else {
-		sprintf(buf, "%u ", n);
-		RETERR(str_totext(buf, target));
-	}
+	RETERR(dns_tsigrcode_totext((dns_rcode_t)n, target));
 
 	/*
 	 * Other Size.