diff --git a/CHANGES b/CHANGES
index b09548e077..c195f375d4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6212.	[bug]		Don't process detach and close netmgr events when
+			the netmgr has been paused. [GL #4200]
+
 	--- 9.18.17 released ---
 
 6206.	[bug]		Add shutdown checks in dns_catz_dbupdate_callback() to
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index c3d1169454..add787ad93 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -35,7 +35,10 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- Processing already queued queries received over TCP can cause assertion
+  failure when the server is reconfigured at the same time or the cache has been
+  flushed.  This has been fixed to not process queued already received queries
+  over TCP while the server is in the "exclusive" mode.  :gl:`#4200`
 
 Known Issues
 ~~~~~~~~~~~~
diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h
index 6e233e20fb..364a933128 100644
--- a/lib/isc/netmgr/netmgr-int.h
+++ b/lib/isc/netmgr/netmgr-int.h
@@ -329,6 +329,9 @@ typedef enum isc__netievent_type {
 	netievent_readcb,
 	netievent_sendcb,
 
+	netievent_detach,
+	netievent_close,
+
 	netievent_task,
 	netievent_privilegedtask,
 
@@ -352,8 +355,6 @@ typedef enum isc__netievent_type {
 	netievent_sockstop, /* for multilayer sockets */
 
 	netievent_resume,
-	netievent_detach,
-	netievent_close,
 } isc__netievent_type;
 
 typedef union {