diff --git a/pkg/experiment/query_backend/client/client.go b/pkg/experiment/query_backend/client/client.go
index 186fcb5c2d..25821ae9fa 100644
--- a/pkg/experiment/query_backend/client/client.go
+++ b/pkg/experiment/query_backend/client/client.go
@@ -37,6 +37,7 @@ func dial(address string, grpcClientConfig grpcclient.Config) (*grpc.ClientConn,
 	options = append(options,
 		grpc.WithUnaryInterceptor(otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer())),
 		grpc.WithDefaultServiceConfig(grpcServiceConfig),
+		grpc.WithMaxCallAttempts(500),
 	)
 	return grpc.NewClient(address, options...)
 }
diff --git a/pkg/experiment/query_backend/concurrency.go b/pkg/experiment/query_backend/concurrency.go
index 54cc724230..3a411c9c4d 100644
--- a/pkg/experiment/query_backend/concurrency.go
+++ b/pkg/experiment/query_backend/concurrency.go
@@ -38,6 +38,7 @@ var (
 
 func CreateConcurrencyInterceptor(logger log.Logger) (grpc.UnaryServerInterceptor, error) {
 	gclLog := newGclLogger(logger)
+	// TODO(aleks-p): Implement metric registry
 	serverLimit, err := limit.NewGradient2Limit("query-backend-concurrency-limit", minLimit, maxLimit, initialLimit, queueSizeFn, smoothing, longWindow, gclLog, nil)
 	if err != nil {
 		return nil, err