Dashboard - Shutdown fix