diff --git a/CHANGES b/CHANGES
index dc78221b36..a56059ca87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5182.	[bug]		Fix a high-load race/crash in handling of
+			isc_socket_close() in resolver. [GL #834]
+
 5180.	[bug]		delv now honors the operating system's preferred
 			ephemeral port range. [GL #925]
 
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 03b8248fdd..2a6e69c5a6 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1323,7 +1323,8 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp,
 				isc_socket_cancel(sock, NULL,
 						  ISC_SOCKCANCEL_CONNECT);
 		}
-	} else if (RESQUERY_SENDING(query)) {
+	}
+	if (RESQUERY_SENDING(query)) {
 		/*
 		 * Cancel the pending send.
 		 */