diff --git a/haproxy/files/haproxy.cfg b/haproxy/files/haproxy.cfg
index 190db1b..ee6bd73 100644
--- a/haproxy/files/haproxy.cfg
+++ b/haproxy/files/haproxy.cfg
@@ -169,8 +169,8 @@
   {%- endfor %}
   {%- for type, checks in listen.get('health-check', {}).iteritems() %}
   {%- if checks.get('enabled', True) %}
-  {%- if type + '-check' not in listen.get('options', []) %}
-  option {{ type }}-check
+  {%- if type == 'http' and 'httpchk' not in listen.get('options', []) %}
+  option httpchk
   {%- endif %}
   {%- for option in checks.get('options', []) %}
   {{ type }}-check {{ option }}