Fix issue caused by #1316 setting SERVICE_UP too soon