diff --git a/heka/files/input/amqp.toml b/heka/files/input/amqp.toml
index 870731a..c3dbd70 100644
--- a/heka/files/input/amqp.toml
+++ b/heka/files/input/amqp.toml
@@ -1,6 +1,6 @@
 [input_{{ name }}]
 type = "AMQPInput"
-url = "amqp{% if values.ssl is defined %}s{% endif %}://{{ values.user }}:{{ values.password }}@{{ values.host }}:{{ values.port }}/{{ values.vhost }}"
+url = "amqp{% if values.ssl is defined and values.ssl.get('enabled', True) %}s{% endif %}://{{ values.user }}:{{ values.password }}@{{ values.host }}/{{ values.vhost }}"
 exchange = "{{ values.exchange }}"
 exchange_type = "{{ values.exchange_type }}"
 
@@ -25,7 +25,7 @@
 decoder = "{{ values.decoder }}"
 splitter = "{{ values.splitter }}"
 
-{%- if values.ssl is defined %}
+{%- if values.ssl is defined and values.ssl.get('enabled', True) %}
 [input_{{ name }}.tls]
 cert_file = "{{ values.ssl.cert_file }}"
 key_file = "{{ values.ssl.key_file }}"
diff --git a/heka/files/output/amqp.toml b/heka/files/output/amqp.toml
index 3305a4e..5932b71 100644
--- a/heka/files/output/amqp.toml
+++ b/heka/files/output/amqp.toml
@@ -1,6 +1,6 @@
 [AMQPOutput_{{ name }}]
 type = "AMQPOutput"
-url = "amqp{% if values.ssl is defined %}s{% endif %}://{{ values.user }}:{{ values.password }}@{{ values.host }}/{{ values.vhost }}"
+url = "amqp{% if values.ssl is defined and values.ssl.get('enabled', True) %}s{% endif %}://{{ values.user }}:{{ values.password }}@{{ values.host }}/{{ values.vhost }}"
 exchange = "{{ values.exchange }}"
 exchange_type = "{{ values.exchange_type }}"
 message_matcher = "{{ values.message_matcher }}"
@@ -12,7 +12,7 @@
 delay = "{{ values.get('delay', '250ms') }}"
 max_retries = {{ values.get('max_retries', '-1') }}
 
-{%- if values.ssl is defined %}
+{%- if values.ssl is defined and values.ssl.get('enabled', True) %}
 [AMQPOutput_{{ name }}.tls]
 cert_file = "{{ values.ssl.cert_file }}"
 key_file = "{{ values.ssl.key_file }}"