diff --git a/muranoagent/cmd/run.py b/muranoagent/cmd/run.py
index cb02fcab..764f5643 100644
--- a/muranoagent/cmd/run.py
+++ b/muranoagent/cmd/run.py
@@ -32,6 +32,12 @@ if os.path.exists(os.path.join(possible_topdir,
 
 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
+import threading  # noqa
+orig_threading.current_thread.__globals__['_active'] = threading._active
 
 
 from oslo_config import cfg