diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index d9e973ab..62083de8 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -1202,7 +1202,7 @@ class XMLStream(object):
             if self.__thread_count != 0:
                 log.debug("Waiting for %s threads to exit." % 
                         self.__thread_count)
-                self.__thread_cond.wait()
+                self.__thread_cond.wait(4)
                 if self.__thread_count != 0:
                     raise Exception("Hanged threads: %s" % threading.enumerate())