diff --git a/trove/cmd/__init__.py b/trove/cmd/__init__.py
index c579ba3bd6..bdb9af1a0d 100644
--- a/trove/cmd/__init__.py
+++ b/trove/cmd/__init__.py
@@ -26,3 +26,9 @@ import os
 if not os.environ.get('NO_EVENTLET_MONKEYPATCH'):
     import eventlet
     eventlet.monkey_patch(all=True)
+    # 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