diff --git a/src/main/modcall.c b/src/main/modcall.c
index b5b6a0814b60..200b5e373660 100644
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -716,7 +716,7 @@ static bool modcall_recurse(REQUEST *request, rlm_components_t component, int de
 				break;
 			}
 
-			vp = fr_cursor_next_by_num(&cursor, vp->da->attr, vp->da->vendor, TAG_ANY);
+			vp = fr_cursor_next_by_num(&cursor, vp->da->attr, vp->da->vendor, g->vpt->attribute.tag);
 
 			/*
 			 *	Delete the cached attribute, if it exists.