1 files changed, 2 insertions, 2 deletions

diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index f0e154864bf0..c03116a580dc 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -439,12 +439,12 @@ struct {								\
 
 #define	CIRCLEQ_FOREACH(var, head, field)				\
 	for ((var) = CIRCLEQ_FIRST((head));				\
-	    (var) != (void *)(head);					\
+	    (var) != (void *)(head) || ((var) = NULL);			\
 	    (var) = CIRCLEQ_NEXT((var), field))
 
 #define	CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
 	for ((var) = CIRCLEQ_LAST((head));				\
-	    (var) != (void *)(head);					\
+	    (var) != (void *)(head) || ((var) = NULL);			\
 	    (var) = CIRCLEQ_PREV((var), field))
 
 #define	CIRCLEQ_INIT(head) do {						\