diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 442faea9f52ccdc07574a2397fee2f267bd65204..fb38af615bca83a71141791bf27931b4a272acb8 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -101,6 +101,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
@@ -1864,7 +1865,7 @@ public class XmppConnectionService extends Service {
                                             openGraphBuilder = openGraphBuilder.jsoupProxy(new JsoupProxy("127.0.0.1", 8118));
                                         }
                                         openGraphBuilder.build().parse(link.toString());
-                                        waiter.acquire();
+                                        waiter.tryAcquire(10L, TimeUnit.SECONDS);
                                     }
                                 } catch (final IOException | InterruptedException e) {  }
                             }