LPS-44684 Avoid duplicate logic