diff --git a/pkg/services/dashboards/database/database.go b/pkg/services/dashboards/database/database.go
index 0959e97643c..4ad536c683d 100644
--- a/pkg/services/dashboards/database/database.go
+++ b/pkg/services/dashboards/database/database.go
@@ -974,6 +974,9 @@ func (d *DashboardStore) GetDashboards(ctx context.Context, query *dashboards.Ge
 		} else {
 			session = sess.In("uid", query.DashboardUIDs)
 		}
+		if query.OrgID > 0 {
+			session = sess.Where("org_id = ?", query.OrgID)
+		}
 
 		err := session.Find(&dashboards)
 		query.Result = dashboards
diff --git a/pkg/services/dashboards/models.go b/pkg/services/dashboards/models.go
index 417c9416a14..76ed476e483 100644
--- a/pkg/services/dashboards/models.go
+++ b/pkg/services/dashboards/models.go
@@ -256,6 +256,7 @@ type GetDashboardTagsQuery struct {
 type GetDashboardsQuery struct {
 	DashboardIDs  []int64
 	DashboardUIDs []string
+	OrgID         int64
 	Result        []*Dashboard
 }