diff --git a/hummingbot/VERSION b/hummingbot/VERSION
index 0f1a7dfc7c..9b1bb85123 100644
--- a/hummingbot/VERSION
+++ b/hummingbot/VERSION
@@ -1 +1 @@
-0.37.0
+0.37.1
diff --git a/hummingbot/client/config/config_helpers.py b/hummingbot/client/config/config_helpers.py
index 420123336b..3e4877a603 100644
--- a/hummingbot/client/config/config_helpers.py
+++ b/hummingbot/client/config/config_helpers.py
@@ -169,7 +169,7 @@ def get_erc20_token_addresses() -> Dict[str, List]:
     address_file_path = TOKEN_ADDRESSES_FILE_PATH
     token_list = {}
 
-    resp = requests.get(token_list_url, timeout=3)
+    resp = requests.get(token_list_url, timeout=1)
     decoded_resp = resp.json()
 
     for token in decoded_resp["tokens"]:
diff --git a/hummingbot/core/utils/trading_pair_fetcher.py b/hummingbot/core/utils/trading_pair_fetcher.py
index 81078f8bb2..1da79fa514 100644
--- a/hummingbot/core/utils/trading_pair_fetcher.py
+++ b/hummingbot/core/utils/trading_pair_fetcher.py
@@ -53,4 +53,8 @@ async def fetch_all(self):
 
         results = await safe_gather(*tasks, return_exceptions=True)
         self.trading_pairs = dict(zip(fetched_connectors, results))
+        # In case trading pair fetching returned timeout, using empty list
+        for connector, result in self.trading_pairs.items():
+            if isinstance(result, asyncio.TimeoutError):
+                self.trading_pairs[connector] = []
         self.ready = True