diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl
index 914e524..d1cdb76 100644
--- a/apache/vhosts/standard.tmpl
+++ b/apache/vhosts/standard.tmpl
@@ -58,7 +58,7 @@
     {% if site.get('DocumentRoot') != False -%}DocumentRoot {{ vals.DocumentRoot }}{% endif %}
     {% if site.get('VirtualDocumentRoot') -%}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% endif %}
 
-    {% if site.get('Timeout') != False %}Timeout {{ vals.Timeout }}{% endif %}
+    {% if site.get('Timeout') != False and site.get('Timeout') != None %}Timeout {{ vals.Timeout }}{% endif %}
     {% if site.get('LimitRequestFields') %}LimitRequestFields {{ vals.LimitRequestFields }}{% endif %}
 
     {%- if site.get('SSLCertificateFile') %}