diff --git a/src/common/xmpp/client_nb.py b/src/common/xmpp/client_nb.py
index 44ea3ba3e..d89bcc35e 100644
--- a/src/common/xmpp/client_nb.py
+++ b/src/common/xmpp/client_nb.py
@@ -76,6 +76,9 @@ class NonBlockingClient:
         the client.
         """
         # to avoid recursive calls
+        if self.ip_addresses:
+            self._try_next_ip()
+            return
         if self.disconnecting: return
 
         log.info('Disconnecting NBClient: %s' % message)
diff --git a/src/common/xmpp/dispatcher_nb.py b/src/common/xmpp/dispatcher_nb.py
index 54274928a..cca56f33a 100644
--- a/src/common/xmpp/dispatcher_nb.py
+++ b/src/common/xmpp/dispatcher_nb.py
@@ -154,6 +154,7 @@ class XMPPDispatcher(PlugIn):
         """
         Send an initial stream header
         """
+        self._owner.Connection.sendqueue = []
         self.Stream = simplexml.NodeBuilder()
         self.Stream.dispatch = self.dispatch
         self.Stream._dispatch_depth = 2