diff --git a/templates/folsom/glance-api.conf b/templates/folsom/glance-api.conf
index 886ca3f1..8ceeadb8 100644
--- a/templates/folsom/glance-api.conf
+++ b/templates/folsom/glance-api.conf
@@ -30,7 +30,10 @@ registry_client_protocol = http
 
 {% include "parts/rabbitmq-single" %}
 
+{% if rabbitmq_host or rabbitmq_hosts -%}
 notifier_strategy = rabbit
+{% endif -%}
+
 filesystem_store_datadir = /var/lib/glance/images/
 
 {% if swift_store %}
diff --git a/templates/icehouse/glance-api.conf b/templates/icehouse/glance-api.conf
index 03489d03..61495266 100644
--- a/templates/icehouse/glance-api.conf
+++ b/templates/icehouse/glance-api.conf
@@ -32,7 +32,10 @@ registry_client_protocol = http
 
 {% include "parts/rabbitmq" %}
 
-notifier_strategy = rabbit
+{% if rabbitmq_host or rabbitmq_hosts -%}
+notification_driver = rabbit
+{% endif -%}
+
 filesystem_store_datadir = /var/lib/glance/images/
 
 {% if swift_store -%}