diff --git a/classes/API/Client/HttpClient.php b/classes/API/Client/HttpClient.php
index 5c13f79d..594a6902 100644
--- a/classes/API/Client/HttpClient.php
+++ b/classes/API/Client/HttpClient.php
@@ -101,6 +101,8 @@ protected function getOptions(HttpRequestInterface $request)
         $options[CURLOPT_RETURNTRANSFER] = true;
         $options[CURLOPT_HEADER] = false;
         $options[CURLOPT_SSLVERSION] = CURL_SSLVERSION_TLSv1_2;
+        $options[CURLOPT_CONNECTTIMEOUT] = 0;
+        $options[CURLOPT_TIMEOUT] = 10;
 
         if (false === empty($request->getBody())) {
             $options[CURLOPT_POSTFIELDS] = $request->getBody();