Bug for production
Temporary fix for the dashboard crashing in production