diff --git a/src/main/java/ai/reveng/invoker/ApiClient.java b/src/main/java/ai/reveng/invoker/ApiClient.java
index a1befed..db8936a 100644
--- a/src/main/java/ai/reveng/invoker/ApiClient.java
+++ b/src/main/java/ai/reveng/invoker/ApiClient.java
@@ -131,6 +131,12 @@ protected void initHttpClient(List<Interceptor> interceptors) {
             builder.addInterceptor(interceptor);
         }
 
+        // Default to 30 seconds timeout
+        builder = builder
+            .connectTimeout(30000, TimeUnit.MILLISECONDS)
+            .readTimeout(30000, TimeUnit.MILLISECONDS)
+            .writeTimeout(30000, TimeUnit.MILLISECONDS);
+
         httpClient = builder.build();
     }