diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce4d2bb98..68be1eb26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Bug Fixes
+
+- Set API timeout from ENV when credentials are specified in ENV #625
+
 ## 1.78.5
 
 ### Improvements
diff --git a/cmd/root.go b/cmd/root.go
index 2660e7586..0b3f4dd57 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -172,6 +172,13 @@ func initConfig() { //nolint:gocyclo
 			account.CurrentAccount.SosEndpoint = sosEndpointFromEnv
 		}
 
+		clientTimeoutFromEnv := readFromEnv("EXOSCALE_API_TIMEOUT")
+		if clientTimeoutFromEnv != "" {
+			if t, err := strconv.Atoi(clientTimeoutFromEnv); err == nil {
+				account.CurrentAccount.ClientTimeout = t
+			}
+		}
+
 		account.GAllAccount = &account.Config{
 			DefaultAccount: account.CurrentAccount.Name,
 			Accounts:       []account.Account{*account.CurrentAccount},