Workaround for failing dashboard switch

Workaround for #1763