diff --git a/dbms/programs/server/TCPHandler.cpp b/dbms/programs/server/TCPHandler.cpp
index cb215eb0af8..dda3ff3f561 100644
--- a/dbms/programs/server/TCPHandler.cpp
+++ b/dbms/programs/server/TCPHandler.cpp
@@ -546,7 +546,7 @@ void TCPHandler::processOrdinaryQueryWithProcessors(size_t num_threads)
     auto & pipeline = state.io.pipeline;
 
     if (pipeline.getMaxThreads())
-        num_threads = pipeline.getMaxThreads();
+        num_threads = std::min(num_threads, pipeline.getMaxThreads());
 
     /// Send header-block, to allow client to prepare output format for data to send.
     {
diff --git a/dbms/src/Processors/QueryPipeline.cpp b/dbms/src/Processors/QueryPipeline.cpp
index df10fae9a38..13e91ac718d 100644
--- a/dbms/src/Processors/QueryPipeline.cpp
+++ b/dbms/src/Processors/QueryPipeline.cpp
@@ -496,6 +496,8 @@ void QueryPipeline::unitePipelines(
         table_locks.insert(table_locks.end(), std::make_move_iterator(pipeline.table_locks.begin()), std::make_move_iterator(pipeline.table_locks.end()));
         interpreter_context.insert(interpreter_context.end(), pipeline.interpreter_context.begin(), pipeline.interpreter_context.end());
         storage_holder.insert(storage_holder.end(), pipeline.storage_holder.begin(), pipeline.storage_holder.end());
+
+        max_threads = std::max(max_threads, pipeline.max_threads);
     }
 
     if (!extremes.empty())