diff --git a/defaults/main.yml b/defaults/main.yml
index 48c4e1f2..0192c8a3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -88,7 +88,7 @@ cinder_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | de
 ## Oslo Messaging
 
 # RabbitMQ
-cinder_oslomsg_heartbeat_in_pthread: "{{ oslomsg_heartbeat_in_pthread | default(_cinder_oslomsg_heartbeat_in_pthread) }}"
+cinder_oslomsg_heartbeat_in_pthread: "{{ oslomsg_heartbeat_in_pthread | default(False) }}"
 
 # RPC
 cinder_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"
diff --git a/vars/main.yml b/vars/main.yml
index 02fa80d1..2018103e 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -152,8 +152,6 @@ cinder_service_catalog:
     description: "{{ cinder_service_v3_description }}"
     state: present
 
-_cinder_oslomsg_heartbeat_in_pthread: "{{ (cinder_services['cinder-volume']['group'] in group_names) | ternary(False, True) }}"
-
 _cinder_coordination_url: >-
   {{ cinder_coordination_driver }}://{{
       groups[cinder_coordination_group]