diff --git a/src/Client/ApiClientOptions.php b/src/Client/ApiClientOptions.php
index f35582fcbd0afb0e658f37c1268cbaf643e64172..6decfa7a17d5c710efec2b3a0817cf9b64e53b17 100644
--- a/src/Client/ApiClientOptions.php
+++ b/src/Client/ApiClientOptions.php
@@ -33,10 +33,4 @@ interface ApiClientOptions extends HttpClientOptions, SerializerOptions
      * @return string
      */
     public function getApiClientClass();
-
-    /**
-     * @return int
-     */
-    public function getTimeout();
-
 }
\ No newline at end of file
diff --git a/src/Client/ApiClientOptionsTimeout.php b/src/Client/ApiClientOptionsTimeout.php
new file mode 100644
index 0000000000000000000000000000000000000000..281c0d37686effbf3f6c373d2897faa3c3b1e16d
--- /dev/null
+++ b/src/Client/ApiClientOptionsTimeout.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace WPDesk\ApiClient\Client;
+
+
+interface ApiClientOptionsTimeout extends ApiClientOptions
+{
+    /**
+     * @return int
+     */
+    public function getTimeout();
+
+}
\ No newline at end of file
diff --git a/src/Client/ClientFactory.php b/src/Client/ClientFactory.php
index bc460661f3e73dc3b5557b51a13bab1989c96c6b..6d84b7ee24e1c8f4f0f9e77e30aa14863ca50e01 100644
--- a/src/Client/ClientFactory.php
+++ b/src/Client/ClientFactory.php
@@ -25,7 +25,7 @@ class ClientFactory
             $options->getLogger(),
             $options->getApiUrl(),
             $options->getDefaultRequestHeaders(),
-            $options->getTimeout()
+            ($options instanceof ApiClientOptionsTimeout)? $options->getTimeout(): null
         );
 
         if ($options->isCachedClient()) {