VE-1619: Move setLive into conditional