Fixed API lag at service start