diff -r c5d6820d884e -r 1e6f16fad3a5 src/main/java/de/uapcore/lightpit/modules/LanguageModule.java
--- a/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java	Sat Oct 31 10:54:20 2020 +0100
+++ b/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java	Thu Nov 05 13:37:48 2020 +0100
@@ -37,6 +37,7 @@
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.*;
 
 @WebServlet(
@@ -85,7 +86,7 @@
     }
 
     @RequestMapping(method = HttpMethod.GET)
-    public ResponseType handle(HttpServletRequest req) {
+    public void handle(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
         final var viewModel = new LanguageView();
         viewModel.setLanguages(languages);
@@ -95,11 +96,12 @@
         setViewModel(req, viewModel);
         setStylesheet(req, "language");
         setContentPage(req, "language");
-        return ResponseType.HTML;
+
+        renderSite(req, resp);
     }
 
     @RequestMapping(method = HttpMethod.POST)
-    public ResponseType switchLanguage(HttpServletRequest req, HttpServletResponse resp) {
+    public void switchLanguage(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 
         Optional<Locale> chosenLanguage = Optional.ofNullable(req.getParameter("language"))
                 .map(Locale::forLanguageTag)
@@ -108,6 +110,6 @@
         chosenLanguage.ifPresent((l) -> req.getSession().setAttribute(Constants.SESSION_ATTR_LANGUAGE, l));
         chosenLanguage.ifPresent(resp::setLocale);
 
-        return handle(req);
+        handle(req, resp);
     }
 }