diff --git a/src/Server/HTTPHandlerFactory.cpp b/src/Server/HTTPHandlerFactory.cpp
index 6459b0aab3b..f34852054d1 100644
--- a/src/Server/HTTPHandlerFactory.cpp
+++ b/src/Server/HTTPHandlerFactory.cpp
@@ -20,6 +20,9 @@ namespace ErrorCodes
     extern const int INVALID_CONFIG_PARAMETER;
 }
 
+static void addCommonDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer & server);
+static void addDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer & server, AsynchronousMetrics & async_metrics);
+
 HTTPRequestHandlerFactoryMain::HTTPRequestHandlerFactoryMain(const std::string & name_)
     : log(&Poco::Logger::get(name_)), name(name_)
 {
@@ -75,7 +78,7 @@ static inline auto createHandlersFactoryFromConfig(
     for (const auto & key : keys)
     {
         if (key == "defaults")
-            addDefaultHandlersFactory(*main_handler_factory, server, &async_metrics);
+            addDefaultHandlersFactory(*main_handler_factory, server, async_metrics);
         else if (startsWith(key, "rule"))
         {
             const auto & handler_type = server.config().getString(prefix + "." + key + ".handler.type", "");
@@ -113,12 +116,7 @@ static inline Poco::Net::HTTPRequestHandlerFactory * createHTTPHandlerFactory(IS
     else
     {
         auto factory = std::make_unique<HTTPRequestHandlerFactoryMain>(name);
-        addDefaultHandlersFactory(*factory, server, &async_metrics);
-
-        auto query_handler = std::make_unique<HandlingRuleHTTPHandlerFactory<DynamicQueryHandler>>(server, "query");
-        query_handler->allowPostAndGetParamsRequest();
-        factory->addHandler(query_handler.release());
-
+        addDefaultHandlersFactory(*factory, server, async_metrics);
         return factory.release();
     }
 }
@@ -126,7 +124,7 @@ static inline Poco::Net::HTTPRequestHandlerFactory * createHTTPHandlerFactory(IS
 static inline Poco::Net::HTTPRequestHandlerFactory * createInterserverHTTPHandlerFactory(IServer & server, const std::string & name)
 {
     auto factory = std::make_unique<HTTPRequestHandlerFactoryMain>(name);
-    addDefaultHandlersFactory(*factory, server, nullptr);
+    addCommonDefaultHandlersFactory(*factory, server);
 
     auto main_handler = std::make_unique<HandlingRuleHTTPHandlerFactory<InterserverIOHTTPHandler>>(server);
     main_handler->allowPostAndGetParamsRequest();
@@ -157,7 +155,7 @@ Poco::Net::HTTPRequestHandlerFactory * createHandlerFactory(IServer & server, As
 static const auto ping_response_expression = "Ok.\n";
 static const auto root_response_expression = "config://http_server_default_response";
 
-void addDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer & server, AsynchronousMetrics * async_metrics)
+void addCommonDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer & server)
 {
     auto root_handler = std::make_unique<HandlingRuleHTTPHandlerFactory<StaticRequestHandler>>(server, root_response_expression);
     root_handler->attachStrictPath("/")->allowGetAndHeadRequest();
@@ -170,13 +168,22 @@ void addDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer
     auto replicas_status_handler = std::make_unique<HandlingRuleHTTPHandlerFactory<ReplicasStatusHandler>>(server);
     replicas_status_handler->attachNonStrictPath("/replicas_status")->allowGetAndHeadRequest();
     factory.addHandler(replicas_status_handler.release());
+}
+
+void addDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer & server, AsynchronousMetrics & async_metrics)
+{
+    addCommonDefaultHandlersFactory(factory, server);
+
+    auto query_handler = std::make_unique<HandlingRuleHTTPHandlerFactory<DynamicQueryHandler>>(server, "query");
+    query_handler->allowPostAndGetParamsRequest();
+    factory.addHandler(query_handler.release());
 
     /// We check that prometheus handler will be served on current (default) port.
-    /// Otherwise it will be created separately, see below.
-    if (async_metrics && server.config().has("prometheus") && server.config().getInt("prometheus.port", 0) == 0)
+    /// Otherwise it will be created separately, see createHandlerFactory(...).
+    if (server.config().has("prometheus") && server.config().getInt("prometheus.port", 0) == 0)
     {
         auto prometheus_handler = std::make_unique<HandlingRuleHTTPHandlerFactory<PrometheusRequestHandler>>(
-            server, PrometheusMetricsWriter(server.config(), "prometheus", *async_metrics));
+            server, PrometheusMetricsWriter(server.config(), "prometheus", async_metrics));
         prometheus_handler->attachStrictPath(server.config().getString("prometheus.endpoint", "/metrics"))->allowGetAndHeadRequest();
         factory.addHandler(prometheus_handler.release());
     }
diff --git a/src/Server/HTTPHandlerFactory.h b/src/Server/HTTPHandlerFactory.h
index 8e21a13ba18..3e8313172eb 100644
--- a/src/Server/HTTPHandlerFactory.h
+++ b/src/Server/HTTPHandlerFactory.h
@@ -103,8 +103,6 @@ private:
     std::function<Poco::Net::HTTPRequestHandler * ()> creator;
 };
 
-void addDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer & server, AsynchronousMetrics * async_metrics);
-
 Poco::Net::HTTPRequestHandlerFactory * createStaticHandlerFactory(IServer & server, const std::string & config_prefix);
 
 Poco::Net::HTTPRequestHandlerFactory * createDynamicHandlerFactory(IServer & server, const std::string & config_prefix);
diff --git a/tests/integration/test_http_handlers_config/test.py b/tests/integration/test_http_handlers_config/test.py
index b31913ba962..b15cd1fdb89 100644
--- a/tests/integration/test_http_handlers_config/test.py
+++ b/tests/integration/test_http_handlers_config/test.py
@@ -124,6 +124,9 @@ def test_defaults_http_handlers():
         assert 200 == cluster.instance.http_request('replicas_status', method='GET').status_code
         assert 'Ok.\n' == cluster.instance.http_request('replicas_status', method='GET').content
 
+        assert 200 == cluster.instance.http_request('?query=SELECT+1', method='GET').status_code
+        assert '1\n' == cluster.instance.http_request('?query=SELECT+1', method='GET').content
+
 def test_prometheus_handler():
     with contextlib.closing(SimpleCluster(ClickHouseCluster(__file__), "prometheus_handler", "test_prometheus_handler")) as cluster:
         assert 404 == cluster.instance.http_request('', method='GET', headers={'XXX': 'xxx'}).status_code