diff --git a/src/erp.c b/src/erp.c
index e7c5fe86..7c11db46 100644
--- a/src/erp.c
+++ b/src/erp.c
@@ -117,7 +117,7 @@ static bool erp_tlv_iter_next(struct erp_tlv_iter *iter)
 	unsigned int tag;
 	unsigned int len;
 
-	if (iter->pos + 2 >= iter->max)
+	if (end - tlv < 2)
 		return false;
 
 	tag = *tlv++;