diff --git a/src/client/Client.cc b/src/client/Client.cc
index 4ce90315ee..18b7d0a2ca 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -260,7 +260,14 @@ int Client::call(const std::string& endpoint, const std::string& method,
 
         client.setInterrupt(&int_flag);
 
-        client.finishAsync(_timeout);
+        if ( _timeout == 0 )
+        {
+            client.finishAsync(xmlrpc_c::timeout());
+        }
+        else
+        {
+            client.finishAsync(_timeout);
+        }
 
         if ( rpc_client->isFinished() )
         {