diff --git a/CHANGES b/CHANGES
index eeb7b203e3..e282bfd896 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]
+
 5181.	[func]		Add a mechanism for a DLZ module to signal that
 			the view's allow-transfer ACL should be used to
 			determine whether transfers are allowed. [GL #803]
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 86dad48ebc..184cba1036 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1321,7 +1321,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.
 		 */