diff --git a/src/main/java/de/uni_hamburg/corpora/server/Static.java b/src/main/java/de/uni_hamburg/corpora/server/Static.java
index fb1c9fe4407aca6043a9ad1bc4a844483496d380..2c58562ac613cc06a667e41271451b27b55e13f6 100644
--- a/src/main/java/de/uni_hamburg/corpora/server/Static.java
+++ b/src/main/java/de/uni_hamburg/corpora/server/Static.java
@@ -28,7 +28,19 @@ public class Static {
     public Response getStatic(@PathParam("staticFile") String fileName) {
         logger.info("Loading file " + fileName);
         try {
-            return Response.ok(this.getClass().getModule().getResourceAsStream("static/" + fileName).readAllBytes()).build();
+            String type;
+            if (fileName.toLowerCase().endsWith("js")) {
+                type = "application/javascript";
+            }
+            else if (fileName.toLowerCase().endsWith("css")) {
+                type = "text/css";
+            }
+            else {
+                type = "application/octet-stream";
+            }
+            return Response.ok(this.getClass().getModule().getResourceAsStream("static/" + fileName).readAllBytes())
+                    .type(type)
+                    .build();
         }
         catch (IOException e) {
             return Response.status(500, "Error loading resource").build();