diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index 03b8ce3c2a20..bfd467224554 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -584,10 +584,6 @@ void TKikimrRunner::InitializeGRpc(const TKikimrRunConfig& runConfig) {
         TServiceCfg hasKeyValue = services.empty();
         names["keyvalue"] = &hasKeyValue;
 
-        if (hasTableService || hasYql) {
-            hasQueryService = true;
-        }
-
         std::unordered_set<TString> enabled;
         for (const auto& name : services) {
             enabled.insert(name);
@@ -641,6 +637,10 @@ void TKikimrRunner::InitializeGRpc(const TKikimrRunConfig& runConfig) {
             hasImport = true;
         }
 
+        if (hasTableService || hasYql) {
+            hasQueryService = true;
+        }
+
         // Enable RL for all services if enabled list is empty
         if (rlServicesEnabled.empty()) {
             for (auto& [name, cfg] : names) {