1 files changed, 12 insertions, 1 deletions
diff --git a/sleekxmpp/util/__init__.py b/sleekxmpp/util/__init__.py
index 1e4af02d..957a9335 100644
--- a/sleekxmpp/util/__init__.py
+++ b/sleekxmpp/util/__init__.py
@@ -18,7 +18,18 @@ from sleekxmpp.util.misc_ops import bytes, unicode, hashes, hash, \
 # Standardize import of Queue class:
 
 import sys
-if 'gevent' in sys.modules:
+
+def _gevent_threads_enabled():
+    if not 'gevent' in sys.modules:
+        return False
+    try:
+        from gevent import thread as green_thread
+        thread = __import__('thread')
+        return thread.LockType is green_thread.LockType
+    except ImportError:
+        return False
+
+if _gevent_threads_enabled():
     import gevent.queue as queue
     Queue = queue.JoinableQueue
 else: