diff --git a/pkg/frontend/v1/frontend.go b/pkg/frontend/v1/frontend.go
index 82bfc98d1e1..b3d95fb5534 100644
--- a/pkg/frontend/v1/frontend.go
+++ b/pkg/frontend/v1/frontend.go
@@ -123,12 +123,13 @@ func New(cfg Config, limits Limits, log log.Logger, registerer prometheus.Regist
 		},
 		[]string{"query_component"},
 	)
+
 	// additional queue dimensions not used in v1/frontend
 	f.requestQueue, err = queue.NewRequestQueue(
 		log,
 		cfg.MaxOutstandingPerTenant,
 		false,
-		false,
+		true,
 		cfg.QuerierForgetDelay,
 		f.queueLength,
 		f.discardedRequests,
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
index 70fce9050df..1f88324f3bd 100644
--- a/pkg/scheduler/scheduler.go
+++ b/pkg/scheduler/scheduler.go
@@ -162,7 +162,7 @@ func NewScheduler(cfg Config, limits Limits, log log.Logger, registerer promethe
 		s.log,
 		cfg.MaxOutstandingPerTenant,
 		cfg.AdditionalQueryQueueDimensionsEnabled,
-		cfg.UseMultiAlgorithmQueryQueue,
+		true,
 		cfg.QuerierForgetDelay,
 		s.queueLength,
 		s.discardedRequests,