diff --git a/templates/libraries/okhttp-gson/ApiClient.mustache b/templates/libraries/okhttp-gson/ApiClient.mustache
index 7bf89e5..8d560b4 100644
--- a/templates/libraries/okhttp-gson/ApiClient.mustache
+++ b/templates/libraries/okhttp-gson/ApiClient.mustache
@@ -258,6 +258,12 @@ public class ApiClient {
         builder.addInterceptor(new GzipRequestInterceptor());
         {{/useGzipFeature}}
 
+        // Default to 30 seconds timeout
+        builder = builder
+            .connectTimeout(30000, TimeUnit.MILLISECONDS)
+            .readTimeout(30000, TimeUnit.MILLISECONDS)
+            .writeTimeout(30000, TimeUnit.MILLISECONDS);
+
         httpClient = builder.build();
     }