diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index 8b5db85fc02..fad9494ba4b 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -1082,9 +1082,7 @@ void ClientBase::onProgress(const Progress & value)
 
 void ClientBase::onTimezoneUpdate(const String & tz)
 {
-    Settings settings;
-    settings.session_timezone = tz;
-    global_context->applySettingsChanges(settings.changes());
+    global_context->setSetting("session_timezone", tz);
 }
 
 
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 062f05105aa..86585d805d9 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -355,10 +355,10 @@ void Connection::receiveHello()
             nonce.emplace(read_nonce);
         }
     }
-    else if (packet_type == Protocol::Server::TimezoneUpdate)
-    {
-        // skip this packet at hello, will receive and process it later
-    }
+//    else if (packet_type == Protocol::Server::TimezoneUpdate)
+//    {
+//        // skip this packet at hello, will receive and process it later
+//    }
     else if (packet_type == Protocol::Server::Exception)
         receiveException()->rethrow();
     else