Update server to buffer the messages