diff --git a/pkg/api/stars.go b/pkg/api/stars.go index 15194d95938..73eeae19ab1 100644 --- a/pkg/api/stars.go +++ b/pkg/api/stars.go @@ -27,10 +27,11 @@ func (hs *HTTPServer) GetStars(c *models.ReqContext) response.Response { OrgId: c.OrgId, } err := hs.dashboardService.GetDashboard(c.Req.Context(), query) - if err != nil { - return response.Error(500, "Failed to get dashboard", err) + + // Grafana admin users may have starred dashboards in multiple orgs. This will avoid returning errors when the dashboard is in another org + if err == nil { + uids = append(uids, query.Result.Uid) } - uids = append(uids, query.Result.Uid) } return response.JSON(200, uids) }