LPS-35692 Fix logic to avoid misconfiguration
LPS-35962 SF