diff --git a/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java b/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java
index 2a7698355..d5edba5ae 100644
--- a/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java
+++ b/src/main/java/ru/yandex/clickhouse/ClickHouseConnectionImpl.java
@@ -385,8 +385,10 @@ public boolean isValid(int timeout) throws SQLException {
                 closeableHttpClient = this.httpclient;
             } else {
                 ClickHouseProperties properties = new ClickHouseProperties(this.properties);
-                properties.setConnectionTimeout((int) TimeUnit.SECONDS.toMillis(timeout));
+                int timeoutMs = (int) TimeUnit.SECONDS.toMillis(timeout);
+                properties.setConnectionTimeout(timeoutMs);
                 properties.setMaxExecutionTime(timeout);
+                properties.setSocketTimeout(timeoutMs);
                 closeableHttpClient = new ClickHouseHttpClientBuilder(properties).buildClient();
                 isAnotherHttpClient = true;
             }
diff --git a/src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java b/src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java
index 040cbaab6..34a3abec1 100644
--- a/src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java
+++ b/src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java
@@ -112,6 +112,7 @@ private RequestConfig getRequestConfig() {
         return RequestConfig.custom()
                 .setSocketTimeout(properties.getSocketTimeout())
                 .setConnectTimeout(properties.getConnectionTimeout())
+                .setConnectionRequestTimeout(properties.getConnectionTimeout())
                 .build();
     }