diff --git a/cmd/catalyst/main.go b/cmd/catalyst/main.go
index ef34b7d..4f8993d 100644
--- a/cmd/catalyst/main.go
+++ b/cmd/catalyst/main.go
@@ -27,7 +27,8 @@ func main() {
 	}
 
 	fsys, _ := fs.Sub(ui.UI, "dist")
-	theCatalyst.Server.Get("/ui/*", api.Static(fsys))
+	staticHandlerFunc := http.HandlerFunc(api.VueStatic(fsys))
+	theCatalyst.Server.Get("/ui/*", http.StripPrefix("/ui", staticHandlerFunc).ServeHTTP)
 
 	if err := http.ListenAndServe(fmt.Sprintf(":%d", config.Port), theCatalyst.Server); err != nil {
 		log.Fatal(err)
diff --git a/ui/vue.config.js b/ui/vue.config.js
index 2d260b8..510b247 100644
--- a/ui/vue.config.js
+++ b/ui/vue.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  publicPath: "/ui/",
+  publicPath: "/ui/static/",
   transpileDependencies: ["vuetify", "@koumoul/vjsf"],
   pwa: {
     name: "Catalyst",