diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index f56c360e..df06d067 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -678,6 +678,9 @@ class XMLStream(object):
                               args=(reconnect, wait, send_close))
 
     def _disconnect(self, reconnect=False, wait=None, send_close=True):
+        if not reconnect:
+            self.auto_reconnect = False
+
         if self.end_session_on_disconnect or send_close:
             self.event('session_end', direct=True)
 
@@ -697,9 +700,6 @@ class XMLStream(object):
         if send_close:
             self.send_raw(self.stream_footer, now=True)
 
-        if not reconnect:
-            self.auto_reconnect = False
-
         # Wait for confirmation that the stream was
         # closed in the other direction. If we didn't
         # send a stream footer we don't need to wait