diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
index 74b22baedec..c0383b6c24a 100644
--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -207,10 +207,6 @@ type GetDataSourcesQuery struct {
 	Result []*DataSource
 }
 
-type GetAllDataSourcesQuery struct {
-	Result []*DataSource
-}
-
 type GetDataSourceByIdQuery struct {
 	Id     int64
 	OrgId  int64
diff --git a/pkg/services/provisioning/datasources/config_reader_test.go b/pkg/services/provisioning/datasources/config_reader_test.go
index 6bc9fbb6c17..5e2d7187eb9 100644
--- a/pkg/services/provisioning/datasources/config_reader_test.go
+++ b/pkg/services/provisioning/datasources/config_reader_test.go
@@ -35,7 +35,6 @@ func TestDatasourceAsConfig(t *testing.T) {
 		bus.AddHandler("test", mockInsert)
 		bus.AddHandler("test", mockUpdate)
 		bus.AddHandler("test", mockGet)
-		bus.AddHandler("test", mockGetAll)
 		bus.AddHandler("test", mockGetOrg)
 
 		Convey("apply default values when missing", func() {
@@ -282,11 +281,6 @@ func mockInsert(cmd *models.AddDataSourceCommand) error {
 	return nil
 }
 
-func mockGetAll(cmd *models.GetAllDataSourcesQuery) error {
-	cmd.Result = fakeRepo.loadAll
-	return nil
-}
-
 func mockGet(cmd *models.GetDataSourceByNameQuery) error {
 	for _, v := range fakeRepo.loadAll {
 		if cmd.Name == v.Name && cmd.OrgId == v.OrgId {
diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go
index 5e9040f0f30..a4b0fc1f54e 100644
--- a/pkg/services/sqlstore/datasource.go
+++ b/pkg/services/sqlstore/datasource.go
@@ -18,7 +18,6 @@ import (
 
 func init() {
 	bus.AddHandler("sql", GetDataSources)
-	bus.AddHandler("sql", GetAllDataSources)
 	bus.AddHandler("sql", AddDataSource)
 	bus.AddHandler("sql", DeleteDataSourceById)
 	bus.AddHandler("sql", DeleteDataSourceByName)
@@ -74,13 +73,6 @@ func GetDataSources(query *models.GetDataSourcesQuery) error {
 	return sess.Find(&query.Result)
 }
 
-func GetAllDataSources(query *models.GetAllDataSourcesQuery) error {
-	sess := x.Limit(5000, 0).Asc("name")
-
-	query.Result = make([]*models.DataSource, 0)
-	return sess.Find(&query.Result)
-}
-
 func DeleteDataSourceById(cmd *models.DeleteDataSourceByIdCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		var rawSQL = "DELETE FROM data_source WHERE id=? and org_id=?"