diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 970c3b2ced0..9a3afea8575 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -71,6 +71,9 @@ func GetDataSourceById(c *models.ReqContext) response.Response {
 		if errors.Is(err, models.ErrDataSourceNotFound) {
 			return response.Error(404, "Data source not found", nil)
 		}
+		if errors.Is(err, models.ErrDataSourceIdentifierNotSet) {
+			return response.Error(400, "Datasource id is missing", nil)
+		}
 		return response.Error(500, "Failed to query datasources", err)
 	}