diff --git a/convertapi/__init__.py b/convertapi/__init__.py
index aeef32b..61886ba 100644
--- a/convertapi/__init__.py
+++ b/convertapi/__init__.py
@@ -15,8 +15,8 @@
 timeout = 1800
 conversion_timeout = None
 conversion_timeout_delta = 10
-upload_timeout = 1800
-download_timeout = 1800
+upload_timeout = None
+download_timeout = None
 max_parallel_uploads = 10
 verify_ssl = True