diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 884075b9cf..d48b3e995b 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -2211,6 +2211,25 @@ main(int argc, char *argv[]) {
 
 	(void)isc_app_run();
 
+	dns_view_detach(&view);
+
+	dns_requestmgr_shutdown(requestmgr);
+	dns_requestmgr_detach(&requestmgr);
+
+	dns_dispatch_detach(&dispatchvx);
+	dns_dispatchmgr_destroy(&dispatchmgr);
+
+	isc_socketmgr_destroy(&socketmgr);
+	isc_timermgr_destroy(&timermgr);
+
+	isc_task_shutdown(task);
+	isc_task_detach(&task);
+	isc_taskmgr_destroy(&taskmgr);
+
+	dst_lib_destroy();
+
+	isc_log_destroy(&lctx);
+
 	query = ISC_LIST_HEAD(queries);
 	while (query != NULL) {
 		struct query *next = ISC_LIST_NEXT(query, link);
@@ -2236,25 +2255,6 @@ main(int argc, char *argv[]) {
 		isc_mem_free(mctx, default_query.ecs_addr);
 	}
 
-	dns_view_detach(&view);
-
-	dns_requestmgr_shutdown(requestmgr);
-	dns_requestmgr_detach(&requestmgr);
-
-	dns_dispatch_detach(&dispatchvx);
-	dns_dispatchmgr_destroy(&dispatchmgr);
-
-	isc_socketmgr_destroy(&socketmgr);
-	isc_timermgr_destroy(&timermgr);
-
-	isc_task_shutdown(task);
-	isc_task_detach(&task);
-	isc_taskmgr_destroy(&taskmgr);
-
-	dst_lib_destroy();
-
-	isc_log_destroy(&lctx);
-
 	isc_mem_destroy(&mctx);
 
 	isc_app_finish();