diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 3fdddf6904eb1d9cff00dada01e24ee5aff51dd6..badff4a82f91890c31b0c588d5990e9a692f0dd7 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1242,6 +1242,7 @@ public class XmppConnectionService extends Service {
                 long secondsSinceLastDisco = (SystemClock.elapsedRealtime() - account.getXmppConnection().getLastDiscoStarted()) / 1000;
                 long discoTimeout = Config.CONNECT_DISCO_TIMEOUT - secondsSinceLastDisco;
                 long timeout = Config.CONNECT_TIMEOUT - secondsSinceLastConnect;
+                if (!areMessagesInitialized()) return false; // No point in thrashing a reconnect while still loading
                 if (timeout < 0) {
                     Log.d(Config.LOGTAG, account.getJid() + ": time out during connect reconnecting (secondsSinceLast=" + secondsSinceLastConnect + ")");
                     account.getXmppConnection().resetAttemptCount(false);