diff --git a/heka/files/output/amqp.toml b/heka/files/output/amqp.toml
index 6f0608d..5378764 100644
--- a/heka/files/output/amqp.toml
+++ b/heka/files/output/amqp.toml
@@ -1,4 +1,4 @@
-{% if pillar.heka.server.output.amqp = 'true' %}
+{% if not pillar.heka.server.output.rabbitmq == 'false' %}
 [AMQPOutput_{{ name }}]
 type = "AMQPOutput"
 url = "amqp://{{ values.user }}:{{ values.password }}@{{ values.host }}/{{ values.vhost }}"
diff --git a/metadata/service/server/amqp/router.yml b/metadata/service/server/amqp/router.yml
index c1eb869..0d0fb15 100644
--- a/metadata/service/server/amqp/router.yml
+++ b/metadata/service/server/amqp/router.yml
@@ -45,6 +45,8 @@
         dashboard01:
           engine: dashboard
           ticker_interval: 30
+        rabbitmq:
+          enable: false
       encoder:
         es_json:
           engine: es-json