diff --git a/haproxy/files/haproxy.cfg b/haproxy/files/haproxy.cfg
index 8156211..ab865d9 100644
--- a/haproxy/files/haproxy.cfg
+++ b/haproxy/files/haproxy.cfg
@@ -58,6 +58,7 @@
 {%- endif %}
 
 {%- for listen_name, listen in proxy.get('listen', {}).iteritems() %}
+{%- if listen.get('enabled', True) %}
 {%- if listen.get('format', 'listen') == 'listen' %}
 
 listen {{ listen_name }}
@@ -167,6 +168,7 @@
   server {{ server.name }} {{ server.host }}:{{ server.port }} {{ server.get('params', '') }}
   {%- endfor %}
 {%- endif %}
+{%- endif %}
 {%- endfor %}
 
 {%- for listen_name, listen in proxy.get('listen', {}).iteritems() %}
diff --git a/haproxy/meta/sensu.yml b/haproxy/meta/sensu.yml
index a7b9a91..2e59499 100644
--- a/haproxy/meta/sensu.yml
+++ b/haproxy/meta/sensu.yml
@@ -29,7 +29,7 @@
 {%- endif %}
 {%- if listen.type|default(None) in ['general-service', 'openstack-service', 'http', 'contrail-api', 'admin'] or listen.mode|default('tcp') == 'http' %}
   remote_haproxy_proxy_http_{{ listen_name }}_{{ network.fqdn }}:
-    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_http -H {{ address }} -p {{ listen.binds.0.port }} -w 5 -c 10"
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_http -H {{ address }} -p {{ listen.binds.0.port }} -w 5 -c 10 -e HTTP/1. -N"
     interval: 60
     occurrences: 1
     subscribers: