diff --git a/CHANGES b/CHANGES
index f9e9f9d2ed..c60eec3ba3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+5905.	[bug]		When the TCP connection would be closed/reset between
+			the connect/accept and the read, the uv_read_start()
+			return value would be unexpected and cause an assertion
+			failure. [GL #3400]
+
 5904.	[func]		Changed dnssec-signzone -H default to 0 additional
 			NSEC3 iterations. [GL #3395]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index f687b1c452..c04c2aed0c 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -46,3 +46,6 @@ Bug Fixes
 - It was possible for a catalog zone consumer to process a catalog zone member
   zone when there was a configured pre-existing forward-only forward zone with
   the same name. This has been fixed. :gl:`#2506`.
+
+- Fix the assertion failure caused by TCP connection closing between the
+  connect (or accept) and the read from the socket. :gl:`#3400`