diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 0dd7b3a825..17c4e388d5 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3910,7 +3910,9 @@ recv_done(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
 	{
 		debug("recv_done: cancel");
 		isc_nmhandle_detach(&query->readhandle);
-		if (!query->canceled) {
+		if (eresult == ISC_R_SHUTTINGDOWN) {
+			cancel_all();
+		} else if (!query->canceled) {
 			cancel_lookup(l);
 		}
 		query_detach(&query);