diff --git a/server/app.py b/server/app.py
index a95ff1a..45772cc 100644
--- a/server/app.py
+++ b/server/app.py
@@ -16,6 +16,7 @@
     NotFoundException,
 )
 from litestar.response import Template
+from litestar.static_files import create_static_files_router
 from litestar.status_codes import HTTP_500_INTERNAL_SERVER_ERROR
 from litestar.stores.redis import RedisStore
 from litestar.template import TemplateConfig
@@ -71,13 +72,14 @@ def static_file_handler(fp: str) -> Response[bytes]:
 
 else:
 
-    @router
-    @litestar.get("/static/{fp:path}", sync_to_thread=True)
-    def static_file_handler(fp: str) -> Response[bytes]:
-        # fp is '/...', so we need to remove prefix make it relative
-        return Response(
-            static_path.joinpath(fp[1:]).read_bytes(), media_type=mimetypes.guess_type(fp)[0]
+    router(
+        create_static_files_router(
+            path="/static/",
+            directories=[static_path],
+            send_as_attachment=False,
+            html_mode=False,
         )
+    )
 
 
 async def __fetch_users(rows: list[asyncpg.Record]) -> dict[int, asyncpg.Record]:
diff --git a/server/router.py b/server/router.py
index 8885516..f2e14ae 100644
--- a/server/router.py
+++ b/server/router.py
@@ -1,10 +1,11 @@
 from collections.abc import Iterator
 
+import litestar
 from litestar.types import AnyCallable
 from typing_extensions import TypeVar
 
 
-T = TypeVar("T", bound=AnyCallable)
+T = TypeVar("T", bound=AnyCallable | litestar.Router)
 
 
 class Router: