diff --git a/templates/config.yaml.j2 b/templates/config.yaml.j2
index 7923f78..a37f6f1 100644
--- a/templates/config.yaml.j2
+++ b/templates/config.yaml.j2
@@ -171,17 +171,17 @@ checks:
 # Restrict the number of checked archives to the last n. Applies only to the "archives" check.
 check_last: {{ borgmatic_check_last }}
 
+{% if borgmatic_commands is defined %}
 # Shell commands or scripts to execute before and after a backup or if an error has occurred.
 # IMPORTANT: All provided commands and scripts are executed with user permissions of borgmatic.
 # Do not forget to set secure permissions on this file as well as on any script listed (chmod 0700) to
 # prevent potential shell injection or privilege escalation.
-{% if borgmatic_commands is defined %}
 commands:
-{{ borgmatic_commands | to_nice_yaml(indent=4) | indent(4, first=true) }}
+{{ borgmatic_commands | to_nice_yaml(indent=4) | indent(4, first=False) }}
 {% endif %}
 
-# Databases specific backup
 {% if borgmatic_databases is defined %}
+# Databases specific backup
 {% for database in borgmatic_databases %}
 {{ database }}_databases:
 {{ borgmatic_databases[database] | to_nice_yaml(indent=4) | indent(4, first=true) }}