diff --git a/configproxy.py b/configproxy.py
index 28c95d8cf4097dd89db66e220a2cfb3e4063da11..35e12fbbe12b242c4969a04a8d429ec199b7241e 100755
--- a/configproxy.py
+++ b/configproxy.py
@@ -159,7 +159,7 @@ def check_security(SECRET_KEY, SECURITY_KEY, SESSION_PROTECTION):
     check_choice("SESSION_PROTECTION", SESSION_PROTECTION, ["strong"])
 
 
-def check_server_name(SERVER_NAME, PREFERRED_URL_SCHEME):
+def check_server_name(SERVER_NAME, PREFERRED_URL_SCHEME, CDN_URL):
     # todo: check ip address and server name
     check_choice(
         "PREFERRED_URL_SCHEME", PREFERRED_URL_SCHEME,
diff --git a/templates/layout.html b/templates/layout.html
index c0a2e897411d6f3624489a18a477ffb08b6f3ea9..2719fd32dae3c584bb5214e59cb7ea8f8d0a84df 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="Protokollsystem" />
-    {% if config.CDN_URL is defined %}
+    {% if config.CDN_URL is defined and config.CDN_URL is not none %}
       <link rel="stylesheet" href="{{[config.CDN_URL, "bootstrap/css/bootstrap.min.css"]|join("/")}}">
     {% else %}
       <link rel="stylesheet" href="{{url_for("static", filename="css/bootstrap.min.css")}}">
@@ -77,7 +77,7 @@ Diese Seite ist leer.
 {% endblock %}
 
 </div>
-{% if config.CDN_URL is defined %}
+{% if config.CDN_URL is defined and config.CDN_URL is not none %}
   <script src="{{[config.CDN_URL, "jquery/jquery.min.js"]|join("/")}}"></script>
   <script src="{{[config.CDN_URL, "bootstrap/js/bootstrap.min.js"]|join("/")}}"></script>
 {% else %}