diff --git a/roles/check-compose/templates/check-compose.conf.j2 b/roles/check-compose/templates/check-compose.conf.j2
index d0a433f53f..3f22dd36e2 100644
--- a/roles/check-compose/templates/check-compose.conf.j2
+++ b/roles/check-compose/templates/check-compose.conf.j2
@@ -1,13 +1,19 @@
 [main]
 {% if check-compose_wait is defined %}
 wait: {{ check-compose_wait }}
+{% endif %}
 {% if check-compose_email-from is defined %}
 email-from: {{ check-compose_email-from }}
+{% endif %}
 {% if check-compose_email-to is defined %}
 email-to: {{ check-compose_email-to }}
+{% endif %}
 {% if check-compose_smtp is defined %}
 smtp: {{ check-compose_smtp }}
+{% endif %}
 {% if check-compose_json is defined %}
 json: {{ check-compose_json }}
+{% endif %}
 {% if check-compose_loglevel is defined %}
 loglevel: {{ check-compose_loglevel }}
+{% endif %}