Adds checking for badge before remove it