diff --git a/ironic/cmd/__init__.py b/ironic/cmd/__init__.py
index 8acedfa92d..bd47b11ac7 100644
--- a/ironic/cmd/__init__.py
+++ b/ironic/cmd/__init__.py
@@ -24,6 +24,12 @@ os.environ['EVENTLET_NO_GREENDNS'] = 'yes'  # noqa E402
 import eventlet
 
 eventlet.monkey_patch(os=False)
+# 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
 
 from ironic.common import i18n  # noqa for I202 due to 'import eventlet' above