[T-4879] [FIX] Call super and return out of loop

Merged Facundo Barral requested to merge T-4879 into 12.0-stage

Merge request reports