Ensure messages are not missed