diff --git a/src/RestSharp/Options/RestClientOptions.cs b/src/RestSharp/Options/RestClientOptions.cs
index 49c197ffc..81f88694d 100644
--- a/src/RestSharp/Options/RestClientOptions.cs
+++ b/src/RestSharp/Options/RestClientOptions.cs
@@ -172,10 +172,9 @@ public RestClientOptions(string baseUrl) : this(new Uri(Ensure.NotEmptyString(ba
     public CookieContainer? CookieContainer { get; set; }
 
     /// <summary>
-    /// Maximum request duration in milliseconds. When the request timeout is specified using <seealso cref="RestRequest.Timeout"/>,
-    /// the lowest value between the client timeout and request timeout will be used.
+    /// Request duration. Used when the request timeout is not specified using <seealso cref="RestRequest.Timeout"/>,
     /// </summary>
-    public int MaxTimeout { get; set; }
+    public TimeSpan? Timeout { get; set; }
 
     /// <summary>
     /// Default encoding to use when no encoding is specified in the content type header.
diff --git a/src/RestSharp/Request/RestRequest.cs b/src/RestSharp/Request/RestRequest.cs
index 9748fa9cf..64e603b7d 100644
--- a/src/RestSharp/Request/RestRequest.cs
+++ b/src/RestSharp/Request/RestRequest.cs
@@ -136,7 +136,7 @@ public RestRequest(Uri resource, Method method = Method.Get)
     /// <summary>
     /// Custom request timeout
     /// </summary>
-    public int Timeout { get; set; }
+    public TimeSpan? Timeout { get; set; }
 
     /// <summary>
     /// The Resource URL to make the request against.
diff --git a/src/RestSharp/RestClient.Async.cs b/src/RestSharp/RestClient.Async.cs
index d3701e221..f34ed1866 100644
--- a/src/RestSharp/RestClient.Async.cs
+++ b/src/RestSharp/RestClient.Async.cs
@@ -18,6 +18,8 @@
 namespace RestSharp;
 
 public partial class RestClient {
+    // Default HttpClient timeout 
+    public TimeSpan DefaultTimeout = TimeSpan.FromSeconds(100);
     /// <inheritdoc />
     public async Task<RestResponse> ExecuteAsync(RestRequest request, CancellationToken cancellationToken = default) {
         using var internalResponse = await ExecuteRequestAsync(request, cancellationToken).ConfigureAwait(false);
@@ -90,7 +92,7 @@ async Task<HttpResponse> ExecuteRequestAsync(RestRequest request, CancellationTo
         message.Headers.Host         = Options.BaseHost;
         message.Headers.CacheControl = request.CachePolicy ?? Options.CachePolicy;
 
-        using var timeoutCts = new CancellationTokenSource(request.Timeout > 0 ? request.Timeout : int.MaxValue);
+        using var timeoutCts = new CancellationTokenSource(request.Timeout ?? Options.Timeout ?? DefaultTimeout);
         using var cts        = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken);
 
         var ct = cts.Token;
diff --git a/src/RestSharp/RestClient.cs b/src/RestSharp/RestClient.cs
index d4ae91867..528e967f8 100644
--- a/src/RestSharp/RestClient.cs
+++ b/src/RestSharp/RestClient.cs
@@ -216,7 +216,9 @@ public RestClient(
         : this(new HttpClient(handler, disposeHandler), true, configureRestClient, configureSerialization) { }
 
     static void ConfigureHttpClient(HttpClient httpClient, RestClientOptions options) {
-        if (options.MaxTimeout > 0) httpClient.Timeout = TimeSpan.FromMilliseconds(options.MaxTimeout);
+        
+        // We will use Options.Timeout in ExecuteAsInternalAsync method
+        httpClient.Timeout = Timeout.InfiniteTimeSpan;
 
         if (options.UserAgent != null &&
             httpClient.DefaultRequestHeaders.UserAgent.All(x => $"{x.Product?.Name}/{x.Product?.Version}" != options.UserAgent)) {
diff --git a/test/RestSharp.Tests.Integrated/NonProtocolExceptionHandlingTests.cs b/test/RestSharp.Tests.Integrated/NonProtocolExceptionHandlingTests.cs
index 6f6d8ebda..febba56a2 100644
--- a/test/RestSharp.Tests.Integrated/NonProtocolExceptionHandlingTests.cs
+++ b/test/RestSharp.Tests.Integrated/NonProtocolExceptionHandlingTests.cs
@@ -50,7 +50,7 @@ public async Task Handles_HttpClient_Timeout_Error() {
     public async Task Handles_Server_Timeout_Error() {
         var client = new RestClient(_server.Url);
 
-        var request = new RestRequest("404") { Timeout = 500 };
+        var request  = new RestRequest("404") { Timeout = TimeSpan.FromMilliseconds(500) };
         var response = await client.ExecuteAsync(request);
 
         response.ErrorException.Should().BeOfType<TaskCanceledException>();
@@ -60,7 +60,7 @@ public async Task Handles_Server_Timeout_Error() {
     [Fact]
     public async Task Handles_Server_Timeout_Error_With_Deserializer() {
         var client   = new RestClient(_server.Url);
-        var request  = new RestRequest("404") { Timeout = 500 };
+        var request  = new RestRequest("404") { Timeout = TimeSpan.FromMilliseconds(500) };
         var response = await client.ExecuteAsync<TestResponse>(request);
 
         response.Data.Should().BeNull();
diff --git a/test/RestSharp.Tests.Integrated/PutTests.cs b/test/RestSharp.Tests.Integrated/PutTests.cs
index 1a0e09f89..ba210dccc 100644
--- a/test/RestSharp.Tests.Integrated/PutTests.cs
+++ b/test/RestSharp.Tests.Integrated/PutTests.cs
@@ -40,7 +40,7 @@ public async Task Can_Timeout_PUT_Async() {
         var request = new RestRequest(TimeoutResource, Method.Put).AddBody("Body_Content");
 
         // Half the value of ResponseHandler.Timeout
-        request.Timeout = 200;
+        request.Timeout = TimeSpan.FromMilliseconds(200);
 
         var response = await _client.ExecuteAsync(request);
 
diff --git a/test/RestSharp.Tests.Integrated/RequestTests.cs b/test/RestSharp.Tests.Integrated/RequestTests.cs
index 98c04e65e..066200fd0 100644
--- a/test/RestSharp.Tests.Integrated/RequestTests.cs
+++ b/test/RestSharp.Tests.Integrated/RequestTests.cs
@@ -57,7 +57,7 @@ public async Task Can_Timeout_GET_Async() {
         var request = new RestRequest("timeout").AddBody("Body_Content");
 
         // Half the value of ResponseHandler.Timeout
-        request.Timeout = 200;
+        request.Timeout = TimeSpan.FromMilliseconds(200);
 
         var response = await _client.ExecuteAsync(request);