[Bug Fix] Fix capping messages being displayed more than once