diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
index 79c9018ad..bf2448ece 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/HttpClient.kt
@@ -4,6 +4,7 @@ import com.vitorpamplona.amethyst.model.Account
 import okhttp3.OkHttpClient
 import java.net.InetSocketAddress
 import java.net.Proxy
+import java.time.Duration
 
 object HttpClient {
     private var proxy: Proxy? = null
@@ -13,7 +14,14 @@ object HttpClient {
     }
 
     fun getHttpClient(): OkHttpClient {
-        return OkHttpClient.Builder().proxy(proxy).build()
+        val seconds = if (proxy != null) 20L else 10L
+        val duration = Duration.ofSeconds(seconds)
+        return OkHttpClient.Builder()
+            .proxy(proxy)
+            .readTimeout(duration)
+            .connectTimeout(duration)
+            .writeTimeout(duration)
+            .build()
     }
 
     fun getProxy(): Proxy? {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
index 8408e985a..6fdbd3c0d 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
@@ -11,6 +11,7 @@ import okhttp3.Response
 import okhttp3.WebSocket
 import okhttp3.WebSocketListener
 import java.net.Proxy
+import java.time.Duration
 import java.util.Date
 
 enum class FeedType {
@@ -24,12 +25,13 @@ class Relay(
     var activeTypes: Set<FeedType> = FeedType.values().toSet(),
     proxy: Proxy?
 ) {
-    init {
-        println("Tor: ${proxy != null} url: $url")
-    }
-
+    val seconds = if (proxy != null) 20L else 10L
+    val duration = Duration.ofSeconds(seconds)
     private val httpClient = OkHttpClient.Builder()
         .proxy(proxy)
+        .readTimeout(duration)
+        .connectTimeout(duration)
+        .writeTimeout(duration)
         .followRedirects(true)
         .followSslRedirects(true)
         .build()