diff --git a/watcher/cmd/__init__.py b/watcher/cmd/__init__.py
index 567eb1305..f3a20d42d 100644
--- a/watcher/cmd/__init__.py
+++ b/watcher/cmd/__init__.py
@@ -18,3 +18,10 @@
 import eventlet
 
 eventlet.monkey_patch()
+
+# Monkey patch the original current_thread to use the up-to-date _active
+# global variable. See https://bugs.launchpad.net/bugs/1863021 and
+# https://github.com/eventlet/eventlet/issues/592
+import __original_module_threading as orig_threading  # noqa
+import threading  # noqa
+orig_threading.current_thread.__globals__['_active'] = threading._active