EDISON-279: Fix conditional