@@ -68,5 +68,12 @@ def _append_path(self, path_chunk: str = None, query: str = None) -> 'PathBuilde
 
 def get_timeout() -> Timeout:
     """Get the timeout to be used in the HTTP Client"""
-    timeout = float(os.getenv(ENV_CLIENT_REQUEST_TIMEOUT, 0))
-    return timeout if timeout else DEFAULT_TIMEOUT_CONFIG
+    raw_timeout = os.getenv(ENV_CLIENT_REQUEST_TIMEOUT, 0.0)
+    if raw_timeout == 'None':
+        return Timeout(None)  # disable all timeouts
+    elif raw_timeout == '':
+        return DEFAULT_TIMEOUT_CONFIG
+    else:
+        timeout = float(raw_timeout)
+        t = timeout if timeout else DEFAULT_TIMEOUT_CONFIG
+        return t
@@ -463,3 +463,21 @@ def test_set_timeout_using_env_variable_async():
     with mock.patch.dict(os.environ, {ENV_CLIENT_REQUEST_TIMEOUT: '120'}):
         client_instance = client.new_client(HOST, TOKEN, is_async=True)
         assert client_instance.session.timeout.read == 120
+
+
+def test_disable_all_timeouts():
+    with mock.patch.dict(os.environ, {ENV_CLIENT_REQUEST_TIMEOUT: 'None'}):
+        client_instance = client.new_client(HOST, TOKEN)
+        assert client_instance.session.timeout.read is None
+
+
+def test_env_client_request_timeout_env_var_is_empty_string():
+    with mock.patch.dict(os.environ, {ENV_CLIENT_REQUEST_TIMEOUT: ''}):
+        client_instance = client.new_client(HOST, TOKEN)
+        assert client_instance.session.timeout.read == DEFAULT_TIMEOUT_CONFIG.read
+
+
+def test_env_client_request_timeout_env_var_is_zero():
+    with mock.patch.dict(os.environ, {ENV_CLIENT_REQUEST_TIMEOUT: '0'}):
+        client_instance = client.new_client(HOST, TOKEN)
+        assert client_instance.session.timeout.read == DEFAULT_TIMEOUT_CONFIG.read