Issue #21008: Fixed issue in dashboard refresh