diff --git a/src/ie.c b/src/ie.c
index 35057cf7..8ee0c77b 100644
--- a/src/ie.c
+++ b/src/ie.c
@@ -49,6 +49,9 @@ bool ie_tlv_iter_next(struct ie_tlv_iter *iter)
 	unsigned int tag;
 	unsigned int len;
 
+	if (iter->pos >= iter->max)
+		return false;
+
 	tag = *tlv++;
 	len = *tlv++;