diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 25442c89f99..13f28806066 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -107,6 +107,7 @@ namespace ErrorCodes
     extern const int UNRECOGNIZED_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int CANNOT_OPEN_FILE;
+    extern const int CANNOT_PARSE_DATETIME;
 }
 
 }
@@ -1599,6 +1600,9 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
     progress_indication.resetProgress();
     profile_events.watch.restart();
 
+    /// A query may contain timezone setting. To handle this, old client-wide tz is saved here.
+    /// If timezone was set for a query, after its execution client tz will be back to old one.
+    /// If it was a settings query, new setting will be applied to client.
     const std::string old_timezone = DateLUT::instance().getTimeZone();
 
     {
@@ -1649,8 +1653,18 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
 
         bool is_async_insert = global_context->getSettingsRef().async_insert && insert && insert->hasInlinedData();
 
-        if (!global_context->getSettingsRef().timezone.toString().empty())
-            DateLUT::setDefaultTimezone(global_context->getSettingsRef().timezone);
+        /// pre-load timezone from (query) settings -- new timezone may also be specified in query.
+        try
+        {
+            if (!global_context->getSettingsRef().timezone.toString().empty())
+                DateLUT::setDefaultTimezone(global_context->getSettingsRef().timezone);
+        }
+        catch (Poco::Exception &)
+        {
+            throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME,
+                            "Invalid time zone {} in client settings. Use `SET timezone = \'New/TZ\'` to set a proper timezone.",
+                            global_context->getSettingsRef().timezone.toString());
+        }
 
         /// INSERT query for which data transfer is needed (not an INSERT SELECT or input()) is processed separately.
         if (insert && (!insert->select || input_function) && !insert->watch && !is_async_insert)
@@ -1687,9 +1701,17 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
 
             global_context->addQueryParameters(set_query->query_parameters);
 
+            try
+            {
             if (!global_context->getSettingsRef().timezone.toString().empty())
                 DateLUT::setDefaultTimezone(global_context->getSettingsRef().timezone);
-
+            }
+            catch (Poco::Exception &)
+            {
+                throw Exception(ErrorCodes::CANNOT_PARSE_DATETIME,
+                            "Invalid time zone {} in client settings. Use `SET timezone = \'New/TZ\'` to set a proper timezone.",
+                            global_context->getSettingsRef().timezone.toString());
+            }
         }
         if (const auto * use_query = parsed_query->as<ASTUseQuery>())
         {
diff --git a/tests/queries/0_stateless/02668_timezone_setting.reference b/tests/queries/0_stateless/02674_timezone_setting.reference
similarity index 100%
rename from tests/queries/0_stateless/02668_timezone_setting.reference
rename to tests/queries/0_stateless/02674_timezone_setting.reference
diff --git a/tests/queries/0_stateless/02668_timezone_setting.sql b/tests/queries/0_stateless/02674_timezone_setting.sql
similarity index 73%
rename from tests/queries/0_stateless/02668_timezone_setting.sql
rename to tests/queries/0_stateless/02674_timezone_setting.sql
index f331ab58307..51820fc2dca 100644
--- a/tests/queries/0_stateless/02668_timezone_setting.sql
+++ b/tests/queries/0_stateless/02674_timezone_setting.sql
@@ -5,5 +5,5 @@ SELECT toDateTime64(toDateTime64('1999-12-12 23:23:23.123', 3), 3, 'Europe/Zuric
 SET timezone = 'Europe/Zurich';
 SELECT toDateTime64(toDateTime64('1999-12-12 23:23:23.123', 3), 3, 'Asia/Novosibirsk');
 
-SET timezone = 'Абырвалг';
-select now(); -- { serverError POCO_EXCEPTION }
\ No newline at end of file
+SET timezone = 'Абырвалг'; -- { clientError CANNOT_PARSE_DATETIME }
+select now();  -- { clientError CANNOT_PARSE_DATETIME }
\ No newline at end of file