diff --git a/lib/iqueue.h b/lib/iqueue.h
index 5cf0c4bb7..a6456a6cb 100644
--- a/lib/iqueue.h
+++ b/lib/iqueue.h
@@ -57,6 +57,10 @@
 		(list)->length--; \
 		if (!(list)->head) \
 			(list)->tail = NULL; \
+		else { \
+			__auto_type __head = (__typeof((list)->offset)) (list)->head; \
+			__head->link.prev = NULL; \
+		} \
 	} \
 	__ret; \
 })
@@ -71,6 +75,10 @@
 		(list)->length--; \
 		if (!(list)->tail) \
 			(list)->head = NULL; \
+		else { \
+			__auto_type __tail = (__typeof((list)->offset)) (list)->tail; \
+			__tail->link.next = NULL; \
+		} \
 	} \
 	__ret; \
 })
@@ -118,6 +126,7 @@
 	} \
 	else \
 		(list)->head = __link->link.next; \
+	__link->link.next = __link->link.prev = NULL; \
 	(list)->length--; \
 } while (0)