[distribution_list][CHG] Improve performance

Avoid doing redundant treatment into the loop case where we are in `safe_mode`