diff --git a/cmd/influxd/launcher/launcher.go b/cmd/influxd/launcher/launcher.go
index 56aa622c8c..d7883823ab 100644
--- a/cmd/influxd/launcher/launcher.go
+++ b/cmd/influxd/launcher/launcher.go
@@ -535,7 +535,8 @@ func (m *Launcher) run(ctx context.Context) (err error) {
 		VariableService:                 variableSvc,
 		PasswordsService:                passwdsSvc,
 		OnboardingService:               onboardingSvc,
-		ProxyQueryService:               storageQueryService,
+		InfluxQLService:                 nil, // No InfluxQL support
+		FluxService:                     storageQueryService,
 		TaskService:                     taskSvc,
 		TelegrafService:                 telegrafSvc,
 		ScraperTargetStoreService:       scraperTargetSvc,
diff --git a/http/api_handler.go b/http/api_handler.go
index 7b5d0d81be..f9888c5b96 100644
--- a/http/api_handler.go
+++ b/http/api_handler.go
@@ -61,7 +61,8 @@ type APIBackend struct {
 	VariableService                 influxdb.VariableService
 	PasswordsService                influxdb.PasswordsService
 	OnboardingService               influxdb.OnboardingService
-	ProxyQueryService               query.ProxyQueryService
+	InfluxQLService                 query.ProxyQueryService
+	FluxService                     query.ProxyQueryService
 	TaskService                     influxdb.TaskService
 	TelegrafService                 influxdb.TelegrafConfigStore
 	ScraperTargetStoreService       influxdb.ScraperTargetStoreService
diff --git a/http/query_handler.go b/http/query_handler.go
index 9318242fdf..64c417f604 100644
--- a/http/query_handler.go
+++ b/http/query_handler.go
@@ -42,7 +42,7 @@ func NewFluxBackend(b *APIBackend) *FluxBackend {
 	return &FluxBackend{
 		Logger: b.Logger.With(zap.String("handler", "query")),
 
-		ProxyQueryService:   b.ProxyQueryService,
+		ProxyQueryService:   b.FluxService,
 		OrganizationService: b.OrganizationService,
 	}
 }