diff --git a/src/main/java/net/snowflake/client/core/SFSession.java b/src/main/java/net/snowflake/client/core/SFSession.java
index 3d0900940..051b00267 100644
--- a/src/main/java/net/snowflake/client/core/SFSession.java
+++ b/src/main/java/net/snowflake/client/core/SFSession.java
@@ -211,7 +211,7 @@ private JsonNode getQueryMetadata(String queryID) throws SQLException {
             HttpUtil.executeGeneralRequest(
                 get,
                 loginTimeout,
-                authTimeout,
+                0,
                 (int) httpClientSocketTimeout.toMillis(),
                 maxHttpRetries,
                 getHttpClientKey());
@@ -967,7 +967,7 @@ protected void heartbeat() throws SFException, SQLException {
             HttpUtil.executeGeneralRequest(
                 postRequest,
                 SF_HEARTBEAT_TIMEOUT,
-                authTimeout,
+                0,
                 (int) httpClientSocketTimeout.toMillis(),
                 0,
                 getHttpClientKey());
diff --git a/src/main/java/net/snowflake/client/core/SessionUtil.java b/src/main/java/net/snowflake/client/core/SessionUtil.java
index ec856112d..5bdbcd4e8 100644
--- a/src/main/java/net/snowflake/client/core/SessionUtil.java
+++ b/src/main/java/net/snowflake/client/core/SessionUtil.java
@@ -1082,7 +1082,7 @@ static void closeSession(SFLoginInput loginInput) throws SFException, SnowflakeS
           HttpUtil.executeGeneralRequest(
               postRequest,
               loginInput.getLoginTimeout(),
-              loginInput.getAuthTimeout(),
+              0,
               loginInput.getSocketTimeoutInMillis(),
               0,
               loginInput.getHttpClientSettingsKey());
diff --git a/src/main/java/net/snowflake/client/core/StmtUtil.java b/src/main/java/net/snowflake/client/core/StmtUtil.java
index a02fb4d7b..b667bcbc9 100644
--- a/src/main/java/net/snowflake/client/core/StmtUtil.java
+++ b/src/main/java/net/snowflake/client/core/StmtUtil.java
@@ -393,8 +393,8 @@ public static StmtOutput execute(StmtInput stmtInput, ExecTimeTelemetryData exec
             HttpUtil.executeRequest(
                 httpRequest,
                 stmtInput.networkTimeoutInMillis / 1000,
-                stmtInput.socketTimeout,
                 0,
+                stmtInput.socketTimeout,
                 stmtInput.maxRetries,
                 stmtInput.injectSocketTimeout,
                 stmtInput.canceling,
@@ -636,8 +636,8 @@ protected static String getQueryResult(String getResultPath, StmtInput stmtInput
       return HttpUtil.executeRequest(
           httpRequest,
           stmtInput.networkTimeoutInMillis / 1000,
-          stmtInput.socketTimeout,
           0,
+          stmtInput.socketTimeout,
           stmtInput.maxRetries,
           0,
           stmtInput.canceling,
diff --git a/src/main/java/net/snowflake/client/jdbc/telemetry/TelemetryClient.java b/src/main/java/net/snowflake/client/jdbc/telemetry/TelemetryClient.java
index e92a57524..014edb4aa 100644
--- a/src/main/java/net/snowflake/client/jdbc/telemetry/TelemetryClient.java
+++ b/src/main/java/net/snowflake/client/jdbc/telemetry/TelemetryClient.java
@@ -365,7 +365,7 @@ private boolean sendBatch() throws IOException {
                 : HttpUtil.executeGeneralRequest(
                     post,
                     TELEMETRY_HTTP_RETRY_TIMEOUT_IN_SEC,
-                    this.session.getAuthTimeout(),
+                    0,
                     this.session.getHttpClientSocketTimeout(),
                     0,
                     this.session.getHttpClientKey());