diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index ed2642c80..466076217 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -92,7 +92,7 @@ rabbit_opts = [
                 'executable used does not support OpenSSL FIPS mode, '
                 'an exception will be raised.'),
     cfg.BoolOpt('heartbeat_in_pthread',
-                default=True,
+                default=False,
                 help="Run the health check heartbeat thread "
                      "through a native python thread by default. If this "
                      "option is equal to False then the health check "
@@ -100,7 +100,9 @@ rabbit_opts = [
                      "from the parent process. For "
                      "example if the parent process has monkey patched the "
                      "stdlib by using eventlet/greenlet then the heartbeat "
-                     "will be run through a green thread.",
+                     "will be run through a green thread. "
+                     "This option should be set to True only for the "
+                     "wsgi services.",
                 ),
     cfg.FloatOpt('kombu_reconnect_delay',
                  default=1.0,
diff --git a/releasenotes/notes/do-not-run-heartbeat-in-pthread-by-default-42e1299f59b841f8.yaml b/releasenotes/notes/do-not-run-heartbeat-in-pthread-by-default-42e1299f59b841f8.yaml
new file mode 100644
index 000000000..265e709b9
--- /dev/null
+++ b/releasenotes/notes/do-not-run-heartbeat-in-pthread-by-default-42e1299f59b841f8.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The ``[oslo_messaging_rabbit] heartbeat_in_pthread`` config option
+    defaults to ``False`` again.
+    For wsgi applications it is recommended to set this value to ``True``
+    but enabling it for non-wsgi services may break such service.
+    Please check https://bugs.launchpad.net/oslo.messaging/+bug/1934937
+    for more details.