diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index 4cacb4f8aa..eb19c4d7af 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1918,7 +1918,7 @@ update_rpz_cb(void *data) {
 
 	result = dns__rpz_shuttingdown(rpz->rpzs);
 	if (result != ISC_R_SUCCESS) {
-		goto cleanup;
+		goto shuttingdown;
 	}
 
 	isc_ht_init(&newnodes, rpz->rpzs->mctx, 1, ISC_HT_CASE_SENSITIVE);
@@ -1939,6 +1939,7 @@ update_rpz_cb(void *data) {
 cleanup:
 	isc_ht_destroy(&newnodes);
 
+shuttingdown:
 	rpz->updateresult = result;
 }