upgrade es to correctly behave during graceful stop