diff --git a/src/router.ts b/src/router.ts
index 5b236231..2fd11555 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -15,7 +15,7 @@ import { useAuthStore } from "./stores/auth";
  * The router here allows for navigation between different functional pages of the TRIPLE App
  */
 const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
+  history: createWebHistory('/solid-cockpit/'),
   routes: [
     {
       name: "Home",
@@ -47,6 +47,11 @@ const router = createRouter({
       path: "/privacy",
       components: { default: EditPrivacy },
     },
+    {
+      name: "CatchAll",
+      path: "/:pathMatch(.*)*",
+      component: NotFound,
+    },
   ],
 });