diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 6ff5e44..6dec7c5 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -34,7 +34,7 @@ services:
       - {{ port }}
 {% endfor %}
 {% endif %}
-{% if ( container.environment is defined ) or ( container.include_global_env_vars ) %}
+{% if ( container.environment is defined ) or ( container.include_global_env_vars is defined and container.include_global_env_vars) %}
     environment:
 {% if container.include_global_env_vars %}
 {% for global_var in global_env_vars %}