Fixed Dashboard issue #EMM-622