diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2efdc8d5f21..542c6cf7b6f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - Watchdog restart or freeze if ``displaytext`` is more than 128 characters (#21401)
 - Avoid connection errors when switching to safeboot to upload OTA firmware (#21428)
 - Berry Leds matrix alternate more and error about 'bri' attribute (#21431)
+- Wrong timeout in `WebQuery` and `webclient` since Core3
 
 ### Removed
 - Support of old insecure fingerprint algorithm. Deprecated since v8.4.0 (#21417)
diff --git a/lib/libesp32/ESP-Mail-Client/src/ESP_Mail_TCPClient.h b/lib/libesp32/ESP-Mail-Client/src/ESP_Mail_TCPClient.h
index 43bb799d293e..1656a64f0c80 100644
--- a/lib/libesp32/ESP-Mail-Client/src/ESP_Mail_TCPClient.h
+++ b/lib/libesp32/ESP-Mail-Client/src/ESP_Mail_TCPClient.h
@@ -190,7 +190,7 @@ class ESP_Mail_TCPClient
      */
     void setTimeout(uint32_t timeoutSec)
     {
-        _tcp_client->setTimeout(timeoutSec);
+        _tcp_client->setTimeout(timeoutSec * 1000);
     }
 
     /**  Set the BearSSL IO buffer size.
diff --git a/lib/libesp32/HttpClientLight/src/HttpClientLight.cpp b/lib/libesp32/HttpClientLight/src/HttpClientLight.cpp
index 2705d9694d03..6c35df2544d8 100644
--- a/lib/libesp32/HttpClientLight/src/HttpClientLight.cpp
+++ b/lib/libesp32/HttpClientLight/src/HttpClientLight.cpp
@@ -500,7 +500,7 @@ void HTTPClientLight::setTimeout(uint16_t timeout)
 {
     _tcpTimeout = timeout;
     if(connected()) {
-        _client->setTimeout((timeout + 500) / 1000);
+        _client->setTimeout(timeout);
     }
 }
 
@@ -1176,7 +1176,7 @@ bool HTTPClientLight::connect(void)
     }
 
     // set Timeout for WiFiClient and for Stream::readBytesUntil() and Stream::readStringUntil()
-    _client->setTimeout((_tcpTimeout + 500) / 1000);
+    _client->setTimeout(_tcpTimeout);
 
     log_d(" connected to %s:%u", _host.c_str(), _port);