diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 22a035fbd71..ab02d9fac74 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -19,7 +19,6 @@
 
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/Config/getClientConfigPath.h>
-#include <Common/CurrentThread.h>
 #include <Common/Exception.h>
 #include <Common/TerminalSize.h>
 #include <Common/config_version.h>
@@ -311,7 +310,6 @@ int Client::main(const std::vector<std::string> & /*args*/)
 try
 {
     UseSSL use_ssl;
-    auto & thread_status = MainThreadStatus::getInstance();
     setupSignalHandler();
 
     std::cout << std::fixed << std::setprecision(3);
@@ -326,14 +324,6 @@ try
     initTTYBuffer(toProgressOption(config().getString("progress", "default")));
     ASTAlterCommand::setFormatAlterCommandsWithParentheses(true);
 
-    {
-        // All that just to set DB::CurrentThread::get().getGlobalContext()
-        // which is required for client timezone (pushed from server) to work.
-        auto thread_group = std::make_shared<ThreadGroup>();
-        const_cast<ContextWeakPtr&>(thread_group->global_context) = global_context;
-        thread_status.attachToGroup(thread_group, false);
-    }
-
     /// Includes delayed_interactive.
     if (is_interactive)
     {
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index cb1c35743b2..e5f4bac852c 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -27,10 +27,8 @@
 #include <Common/Exception.h>
 #include <Common/Macros.h>
 #include <Common/Config/ConfigProcessor.h>
-#include <Common/ThreadStatus.h>
 #include <Common/TLDListsHolder.h>
 #include <Common/quoteString.h>
-#include <Common/randomSeed.h>
 #include <Common/ThreadPool.h>
 #include <Loggers/OwnFormattingChannel.h>
 #include <Loggers/OwnPatternFormatter.h>
@@ -48,7 +46,6 @@
 #include <Dictionaries/registerDictionaries.h>
 #include <Disks/registerDisks.h>
 #include <Formats/registerFormats.h>
-#include <boost/algorithm/string/replace.hpp>
 #include <boost/program_options/options_description.hpp>
 #include <base/argsToConfig.h>
 #include <filesystem>
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 38aa0ed8b14..03f088f2b61 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -1872,7 +1872,7 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
         ASTPtr parsed_query, std::optional<bool> echo_query_, bool report_error)
 {
     query_context = Context::createCopy(global_context);
-    query_context->makeQueryContext();
+    CurrentThread::QueryScope query_scope(query_context);
 
     resetOutput();
     have_error = false;
@@ -2926,6 +2926,8 @@ void ClientBase::init(int argc, char ** argv)
     /// Don't parse options with Poco library, we prefer neat boost::program_options.
     stopOptionsProcessing();
 
+    MainThreadStatus::getInstance();
+
     stdin_is_a_tty = isatty(STDIN_FILENO);
     stdout_is_a_tty = isatty(STDOUT_FILENO);
     stderr_is_a_tty = isatty(STDERR_FILENO);
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
index c7494e31605..e63e5793505 100644
--- a/src/Client/LocalConnection.cpp
+++ b/src/Client/LocalConnection.cpp
@@ -125,7 +125,6 @@ void LocalConnection::sendQuery(
 
     state->query_id = query_id;
     state->query = query;
-    state->query_scope_holder = std::make_unique<CurrentThread::QueryScope>(query_context);
     state->stage = QueryProcessingStage::Enum(stage);
     state->profile_queue = std::make_shared<InternalProfileEventsQueue>(std::numeric_limits<int>::max());
     CurrentThread::attachInternalProfileEventsQueue(state->profile_queue);
diff --git a/src/Client/LocalConnection.h b/src/Client/LocalConnection.h
index 899d134cce5..bdd0b481529 100644
--- a/src/Client/LocalConnection.h
+++ b/src/Client/LocalConnection.h
@@ -61,8 +61,6 @@ struct LocalQueryState
     /// Time after the last check to stop the request and send the progress.
     Stopwatch after_send_progress;
     Stopwatch after_send_profile_events;
-
-    std::unique_ptr<CurrentThread::QueryScope> query_scope_holder;
 };
 
 
diff --git a/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql b/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
index 2044a9b8d22..092b071cb48 100644
--- a/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
+++ b/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
@@ -1,4 +1,3 @@
-
 DROP TABLE IF EXISTS local_table;
 DROP TABLE IF EXISTS other_table;