diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2
index b7c2d84..dd8c20c 100644
--- a/templates/nginx.conf.j2
+++ b/templates/nginx.conf.j2
@@ -24,7 +24,7 @@ server {
   {% endif %}
     server_name {{ domains | join(' ') }};
 
-{%+ if notls is not defined and unsecure_server is not defined %}
+{%+ if (notls is not defined or not notls) and unsecure_server is not defined %}
     location / {
         # enforce https
         return 301 https://$server_name:443$request_uri;
@@ -40,7 +40,7 @@ server {
     {% endif %}
     }
 }
-{%+ if notls is not defined %}
+{%+ if notls is not defined or not notls %}
 server {
   {% if nginx_listen443 is defined %}
   {{ nginx_listen443 }}
@@ -81,6 +81,7 @@ ssl_certificate /etc/ssl/csr/{{ domains[0] }}-fullchain.crt;
     {% if server -%}
     {{ server | indent(4) }}
     {%- endif %}
+
     {% if server2 is defined -%}
     {{ server2 | indent(4) }}
     {%- endif %}