Issue #21008: Fixed duplicate chart issue on refresh