diff --git a/src/lib/app.ts b/src/lib/app.ts
index 6a31ba5223..d4c7a94c40 100644
--- a/src/lib/app.ts
+++ b/src/lib/app.ts
@@ -126,9 +126,10 @@ export default function getApp(
         res.send(indexHTML);
     });
 
-    app.get('*', (req, res) => {
+    app.get(`${baseUriPath}/*`, (req, res) => {
         if (req.path.includes('api')) {
             res.status(404).send();
+            return;
         }
 
         res.send(indexHTML);