NXP-15359: handle disabling of es, make server config explicit