diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 88d355f100..fa813901c7 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3293,8 +3293,10 @@ tcp_connected(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
 			next = NULL;
 		}
 
-		cancel_lookup(l);
 		query_detach(&query);
+		if (next == NULL) {
+			cancel_lookup(l);
+		}
 		lookup_detach(&l);
 
 		if (next != NULL) {