better offline server state handling