Resolve delay issue with system message badge