diff --git a/dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs b/dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs
index 201cc6c19..4119304e4 100644
--- a/dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs
+++ b/dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs
@@ -652,9 +652,14 @@ HttpResponseMessage ExecuteRequest(string method, string requestUrl, CookieConta
 			if (proxy != null)
 				handler.Proxy = proxy;
 			HttpResponseMessage response;
+			TimeSpan milliseconds = TimeSpan.FromMilliseconds(_timeout);
+#if !NETCORE
+			handler.ReceiveDataTimeout = milliseconds;
+			handler.ReceiveHeadersTimeout = milliseconds;
+#endif
 			using (client = new HttpClient(handler))
 			{
-				client.Timeout = TimeSpan.FromMilliseconds(_timeout);
+				client.Timeout = milliseconds;
 				client.BaseAddress = request.RequestUri;
 
 				using (MemoryStream reqStream = new MemoryStream())