diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index eb756a47156..e2e41c1fb6f 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -115,6 +115,20 @@ void TCPHandler::runImpl()
     try
     {
         receiveHello();
+        sendHello();
+
+        if (!is_interserver_mode) /// In interserver mode queries are executed without a session context.
+        {
+            session->makeSessionContext();
+
+            /// If session created, then settings in session context has been updated.
+            /// So it's better to update the connection settings for flexibility.
+            extractConnectionSettingsFromContext(session->sessionContext());
+
+            /// When connecting, the default database could be specified.
+            if (!default_database.empty())
+                session->sessionContext()->setCurrentDatabase(default_database);
+        }
     }
     catch (const Exception & e) /// Typical for an incorrect username, password, or address.
     {
@@ -140,21 +154,6 @@ void TCPHandler::runImpl()
         throw;
     }
 
-    sendHello();
-
-    if (!is_interserver_mode) /// In interserver mode queries are executed without a session context.
-    {
-        session->makeSessionContext();
-
-        /// If session created, then settings in session context has been updated.
-        /// So it's better to update the connection settings for flexibility.
-        extractConnectionSettingsFromContext(session->sessionContext());
-
-        /// When connecting, the default database could be specified.
-        if (!default_database.empty())
-            session->sessionContext()->setCurrentDatabase(default_database);
-    }
-
     while (true)
     {
         /// We are waiting for a packet from the client. Thus, every `poll_interval` seconds check whether we need to shut down.
diff --git a/tests/queries/0_stateless/02030_client_unknown_database.reference b/tests/queries/0_stateless/02030_client_unknown_database.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02030_client_unknown_database.sh b/tests/queries/0_stateless/02030_client_unknown_database.sh
new file mode 100755
index 00000000000..28bd4895a23
--- /dev/null
+++ b/tests/queries/0_stateless/02030_client_unknown_database.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CLICKHOUSE_DATABASE=no_such_database_could_exist
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "SELECT 1" |& grep -q UNKNOWN_DATABASE