diff --git a/CHANGES b/CHANGES
index 70383ba0dc..361e036b22 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3349.	[bug]		Change #3345 was incomplete. [RT #30233]
+
 3348.	[security]	prevent RRSIG data from being cached if a negative 
 			record matching the covering type exists at a higher 
 			trust level. Such data already can't be retrieved from 
diff --git a/lib/isc/include/isc/queue.h b/lib/isc/include/isc/queue.h
index 6f76bd2750..1bc9d5b4d1 100644
--- a/lib/isc/include/isc/queue.h
+++ b/lib/isc/include/isc/queue.h
@@ -106,10 +106,10 @@
 			LOCK(&(queue).taillock); \
 			headlocked = ISC_TRUE; \
 		} \
-		if ((queue).tail != NULL) \
-			(queue).tail->link.next = (elt); \
 		(elt)->link.prev = (queue).tail; \
 		(elt)->link.next = NULL; \
+		if ((queue).tail != NULL) \
+			(queue).tail->link.next = (elt); \
 		(queue).tail = (elt); \
 		UNLOCK(&(queue).taillock); \
 		if (headlocked) { \