diff --git a/build/config/errorpages.conf b/build/config/errorpages.conf
index 707bfd8..d7ed0a0 100644
--- a/build/config/errorpages.conf
+++ b/build/config/errorpages.conf
@@ -1,4 +1,3 @@
-# error pages
 error_page 400  /errorpages/400.html;
 error_page 401  /errorpages/401.html;
 error_page 403  /errorpages/403.html;
diff --git a/build/config/nginx.conf b/build/config/nginx.conf
index 49b27f4..ea47819 100644
--- a/build/config/nginx.conf
+++ b/build/config/nginx.conf
@@ -43,9 +43,6 @@ http {
     real_ip_recursive on;
     resolver 1.1.1.1;
     include /etc/nginx/config/*.conf;
-    
-    # set default 'fun' error pages
-    include /etc/nginx/errorpages.conf;
 
     # include enabled server blocks from sites/*.conf
     include /etc/nginx/sites/*.conf;
diff --git a/build/sites/05-test_nonsecured.conf b/build/sites/05-test_nonsecured.conf
index cdbeb4a..39357cb 100644
--- a/build/sites/05-test_nonsecured.conf
+++ b/build/sites/05-test_nonsecured.conf
@@ -7,4 +7,7 @@ server {
     location / {
         try_files $uri $uri/ =404;        
     }
+
+    # error pages
+    include /etc/nginx/errorpages.conf;
 }
diff --git a/build/sites/05-test_secured.conf.disabled b/build/sites/05-test_secured.conf.disabled
index 309659f..a5099bc 100644
--- a/build/sites/05-test_secured.conf.disabled
+++ b/build/sites/05-test_secured.conf.disabled
@@ -20,6 +20,10 @@ server {
         autoindex on;
     }
 
+    # error pages
+    include /etc/nginx/errorpages.conf;
+}
+
 server {
     listen 443 ssl https2;
     include /etc/nginx/server_names.conf;
@@ -30,4 +34,7 @@ server {
     location / {
         try_files $uri $uri/ =404;        
     }
+
+    # error pages
+    include /etc/nginx/errorpages.conf;
 }