Fix unnecessary computation on dashboard