diff --git a/tasks/main.yml b/tasks/main.yml
index 5f77e348..87e4ef75 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -87,7 +87,6 @@
     _oslomsg_notify_password: "{{ cinder_oslomsg_notify_password }}"
     _oslomsg_notify_vhost: "{{ cinder_oslomsg_notify_vhost }}"
     _oslomsg_notify_transport: "{{ cinder_oslomsg_notify_transport }}"
-    _oslomsg_configure_notify: "{{ cinder_ceilometer_enabled | bool }}"
   tags:
     - common-mq
     - cinder-config
diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2
index 75a25383..05149037 100644
--- a/templates/cinder.conf.j2
+++ b/templates/cinder.conf.j2
@@ -108,11 +108,9 @@ connection = mysql+pymysql://{{ cinder_galera_user }}:{{ cinder_container_mysql_
 [oslo_messaging_rabbit]
 ssl = {{ cinder_oslomsg_rpc_use_ssl }}
 
-{% if cinder_ceilometer_enabled %}
 [oslo_messaging_notifications]
-driver = messagingv2
+driver = {% if cinder_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
 transport_url = {{ cinder_oslomsg_notify_transport }}://{% for host in cinder_oslomsg_notify_servers.split(',') %}{{ cinder_oslomsg_notify_userid }}:{{ cinder_oslomsg_notify_password }}@{{ host }}:{{ cinder_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ cinder_oslomsg_notify_vhost }}{% if cinder_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
-{% endif %}
 
 [oslo_concurrency]
 lock_path = {{ cinder_lock_path }}