diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 867375ef4729d8edebd8ac8748e61d5634b2f8a8..b59bb890fd53c8afa028c770d6646a53a7b0490f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -352,7 +352,9 @@ public class XmppConnection implements Runnable {
                                 }
                             }
                         }
+                        localSocket.setSoTimeout(Config.SOCKET_TIMEOUT * 1000);
                         if (startXmpp(localSocket)) {
+                            localSocket.setSoTimeout(0); //reset to 0; once the connection is established we don’t want this
                             if (!result.equals(storedBackupResult)) {
                                 mXmppConnectionService.databaseBackend.saveResolverResult(domain, result);
                             }