diff --git a/heka/files/input/amqp.toml b/heka/files/input/amqp.toml
index 60f79f7..f69de65 100644
--- a/heka/files/input/amqp.toml
+++ b/heka/files/input/amqp.toml
@@ -16,8 +16,14 @@
 queue_auto_delete = {{ values.queue_auto_delete }}
 {% endif %}
 
+{% if values.queue is defined %}
 queue = "{{ values.queue }}"
+{% endif %}
+
+{ if values.routing_key is defined %}
 routing_key = "{{ values.routing_key }}"
+{% endif %}
+
 decoder = "{{ values.decoder }}"
 splitter = "{{ values.splitter }}"