diff --git a/heka/files/output/amqp.toml b/heka/files/output/amqp.toml
index 031457d..1d95a43 100644
--- a/heka/files/output/amqp.toml
+++ b/heka/files/output/amqp.toml
@@ -1,4 +1,3 @@
-{% if not pillar.heka.server.output.rabbitmq.enabled == False %}
 [AMQPOutput_{{ name }}]
 type = "AMQPOutput"
 url = "amqp://{{ values.user }}:{{ values.password }}@{{ values.host }}/{{ values.vhost }}"
@@ -12,4 +11,3 @@
 max_delay = "30s"
 delay = "250ms"
 max_retries = 5
-{% endif %}
diff --git a/metadata/service/server/amqp/router.yml b/metadata/service/server/amqp/router.yml
index 505efcf..04d0792 100644
--- a/metadata/service/server/amqp/router.yml
+++ b/metadata/service/server/amqp/router.yml
@@ -42,11 +42,13 @@
           message_matcher: "Logger != 'hekad'"
           flush_count: 10
           flush_interval: 1000
+          enable: true
         dashboard01:
           engine: dashboard
           ticker_interval: 30
+          enable: true
         rabbitmq:
-          enabled: False
+          enabled: false
       encoder:
         es_json:
           engine: es-json