diff --git a/pkg/api/api.go b/pkg/api/api.go
index 013b2ebe076..3d1b28d7aa3 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -148,7 +148,7 @@ func Register(r *macaron.Macaron) {
 			r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource)
 			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource)
 			r.Delete("/:id", DeleteDataSource)
-			r.Get("/:id", GetDataSourceById)
+			r.Get("/:id", wrap(GetDataSourceById))
 			r.Get("/plugins", GetDataSourcePlugins)
 		}, regOrgAdmin)
 
diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 717211d438d..38a4004c241 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -37,20 +37,22 @@ func GetDataSources(c *middleware.Context) {
 	c.JSON(200, result)
 }
 
-func GetDataSourceById(c *middleware.Context) {
+func GetDataSourceById(c *middleware.Context) Response {
 	query := m.GetDataSourceByIdQuery{
 		Id:    c.ParamsInt64(":id"),
 		OrgId: c.OrgId,
 	}
 
 	if err := bus.Dispatch(&query); err != nil {
-		c.JsonApiErr(500, "Failed to query datasources", err)
-		return
+		if err == m.ErrDataSourceNotFound {
+			return ApiError(404, "Data source not found", nil)
+		}
+		return ApiError(500, "Failed to query datasources", err)
 	}
 
 	ds := query.Result
 
-	c.JSON(200, &dtos.DataSource{
+	return Json(200, &dtos.DataSource{
 		Id:                ds.Id,
 		OrgId:             ds.OrgId,
 		Name:              ds.Name,