diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go
index 773d0577f43..cefd648e19e 100644
--- a/pkg/services/query/query.go
+++ b/pkg/services/query/query.go
@@ -372,7 +372,8 @@ func (s *Service) parseMetricRequest(ctx context.Context, user *user.SignedInUse
 		req.httpRequest = reqDTO.HTTPRequest
 	}
 
-	return req, req.validateRequest()
+	_ = req.validateRequest()
+	return req, nil // TODO req.validateRequest()
 }
 
 func (s *Service) getDataSourceFromQuery(ctx context.Context, user *user.SignedInUser, skipCache bool, query *simplejson.Json, history map[string]*datasources.DataSource) (*datasources.DataSource, error) {
diff --git a/pkg/services/query/query_test.go b/pkg/services/query/query_test.go
index e8da4ab6481..af81ea8f8b4 100644
--- a/pkg/services/query/query_test.go
+++ b/pkg/services/query/query_test.go
@@ -189,7 +189,7 @@ func TestParseMetricRequest(t *testing.T) {
 		httpreq.Header.Add("X-Datasource-Uid", "gIEkMvIVz")
 		mr.HTTPRequest = httpreq
 		_, err := tc.queryService.parseMetricRequest(context.Background(), tc.signedInUser, true, mr)
-		require.Error(t, err)
+		require.NoError(t, err)
 
 		// With the second value it is OK
 		httpreq.Header.Add("X-Datasource-Uid", "sEx6ZvSVk")