diff --git a/CHANGES b/CHANGES
index 977cf18b06..339c80767d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6169.	[bug]		named could crash when deleting inline-signing zones
+			with "rndc delzone". [GL #4054]
+
 6165.	[bug]		Fix a logic error in dighost.c which could call the
 			dighost_shutdown() callback twice and cause problems
 			if the callback function was not idempotent. [GL #4039]
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 16f7708464..834185de90 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -7220,8 +7220,14 @@ zone_resigninc(dns_zone_t *zone) {
 	}
 
 	ZONEDB_LOCK(&zone->dblock, isc_rwlocktype_read);
-	dns_db_attach(zone->db, &db);
+	if (zone->db != NULL) {
+		dns_db_attach(zone->db, &db);
+	}
 	ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_read);
+	if (db == NULL) {
+		result = ISC_R_FAILURE;
+		goto failure;
+	}
 
 	result = dns_db_newversion(db, &version);
 	if (result != ISC_R_SUCCESS) {