diff --git a/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/host/RequestHandler.java b/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/host/RequestHandler.java
index 1f480ac..c078687 100644
--- a/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/host/RequestHandler.java
+++ b/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/host/RequestHandler.java
@@ -18,8 +18,6 @@ public class RequestHandler extends VirtualHostBranch implements HttpRequestHand
         }
         if (resp.getHeader("Cache-Control").isEmpty())
             resp.addHeader("Cache-Control", "no-cache");
-        if (resp.getHeader("Server").isEmpty())
-            resp.addHeader("Server", "LibWeb using BlueMapCore");
         return resp;
     }
 
diff --git a/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/variant/hosted/HttpConnection.java b/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/variant/hosted/HttpConnection.java
index 181533d..96338b8 100644
--- a/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/variant/hosted/HttpConnection.java
+++ b/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/variant/hosted/HttpConnection.java
@@ -102,6 +102,9 @@ public class HttpConnection implements Runnable {
 	}
 
 	private void sendResponse(HttpResponse response) throws IOException {
+        // Fill in missing headers
+        if (response.getHeader("Server").isEmpty())
+            response.addHeader("Server", "LibWeb using BlueMapCore");
 		response.write(out);
 		out.flush();
 	}
diff --git a/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/variant/shared/MainHttpHandlerImpl.java b/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/variant/shared/MainHttpHandlerImpl.java
index c4f3b6a..1239c3f 100644
--- a/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/variant/shared/MainHttpHandlerImpl.java
+++ b/libjf-web-v1/src/main/java/io/gitlab/jfronny/libjf/web/impl/variant/shared/MainHttpHandlerImpl.java
@@ -25,6 +25,9 @@ public class MainHttpHandlerImpl implements MainHttpHandler {
         try (ByteArrayInputStream is = new ByteArrayInputStream(request);
              HttpResponse response = JfWeb.getHandler().handle(HttpRequest.read(is))) {
             if (response.getStatusCode() == HttpStatusCode.NOT_FOUND) return null;
+            // Fill in missing headers
+            if (response.getHeader("Server").isEmpty())
+                response.addHeader("Server", "LibWeb using MainHTTP");
             // Write and send response
             try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
                 response.write(os);