diff --git a/src/Calendars/Main.tsx b/src/Calendars/Main.tsx
index 6e38ebe..acdebcb 100644
--- a/src/Calendars/Main.tsx
+++ b/src/Calendars/Main.tsx
@@ -19,7 +19,7 @@ import Calendar from "./Calendar";
 import Event from "./Event";
 import LoadingIndicator from "../widgets/LoadingIndicator";
 import EventEdit from "./EventEdit";
-import PageNotFound from "../PageNotFound";
+import PageNotFound, { PageNotFoundRoute } from "../PageNotFound";
 
 import { CachedCollection, getItemNavigationUid, getDecryptCollectionsFunction, getDecryptItemsFunction, PimFab, itemDelete, itemSave } from "../Pim/helpers";
 import { historyPersistor } from "../persist-state-history";
@@ -220,10 +220,12 @@ export default function CalendarsMain() {
                 </div>
                 <Event item={item} />
               </Route>
+              <PageNotFoundRoute />
             </Switch>
           );
         }}
       />
+      <PageNotFoundRoute />
     </Switch>
   );
 }
diff --git a/src/Contacts/Main.tsx b/src/Contacts/Main.tsx
index d56825d..7b64aae 100644
--- a/src/Contacts/Main.tsx
+++ b/src/Contacts/Main.tsx
@@ -18,7 +18,7 @@ import SearchableAddressBook from "./SearchableAddressBook";
 import Contact from "./Contact";
 import LoadingIndicator from "../widgets/LoadingIndicator";
 import ContactEdit from "./ContactEdit";
-import PageNotFound from "../PageNotFound";
+import PageNotFound, { PageNotFoundRoute } from "../PageNotFound";
 
 import { CachedCollection, getItemNavigationUid, getDecryptCollectionsFunction, getDecryptItemsFunction, PimFab, itemSave, itemDelete } from "../Pim/helpers";
 
@@ -183,10 +183,12 @@ export default function ContactsMain() {
                 </div>
                 <Contact item={item} />
               </Route>
+              <PageNotFoundRoute />
             </Switch>
           );
         }}
       />
+      <PageNotFoundRoute />
     </Switch>
   );
 }
diff --git a/src/PageNotFound.tsx b/src/PageNotFound.tsx
index 2e684de..661c4fe 100644
--- a/src/PageNotFound.tsx
+++ b/src/PageNotFound.tsx
@@ -2,13 +2,26 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import * as React from "react";
+import { Route } from "react-router";
 
 import Container from "./widgets/Container";
 
+export function PageNotFoundRoute(props: { container?: boolean }) {
+  return (
+    <Route path="*">
+      {props.container ? (
+        <Container>
+          <PageNotFound />
+        </Container>
+      ) : (
+        <PageNotFound />
+      )}
+    </Route>
+  );
+}
+
 export default function PageNotFound() {
   return (
-    <Container>
-      <h1>404 Page Not Found</h1>
-    </Container>
+    <h1>404 Page Not Found</h1>
   );
 }
diff --git a/src/SyncGate.tsx b/src/SyncGate.tsx
index 6769d06..d3a82a3 100644
--- a/src/SyncGate.tsx
+++ b/src/SyncGate.tsx
@@ -27,6 +27,7 @@ import { StoreState } from "./store";
 import { performSync } from "./store/actions";
 import { useCredentials } from "./credentials";
 import PimNavigationTabs from "./Pim/NavigationTabs";
+import { PageNotFoundRoute } from "./PageNotFound";
 
 export default function SyncGate() {
   const etebase = useCredentials();
@@ -98,6 +99,7 @@ export default function SyncGate() {
               <TasksMain />
             </Container>
           </Route>
+          <PageNotFoundRoute container />
         </Switch>
       </Route>
       <Route
@@ -119,6 +121,7 @@ export default function SyncGate() {
           <Debug />
         )}
       />
+      <PageNotFoundRoute container />
     </Switch>
   );
 }
diff --git a/src/Tasks/Main.tsx b/src/Tasks/Main.tsx
index 7319baa..6276aec 100644
--- a/src/Tasks/Main.tsx
+++ b/src/Tasks/Main.tsx
@@ -18,7 +18,7 @@ import TaskList from "./TaskList";
 import Task from "./Task";
 import LoadingIndicator from "../widgets/LoadingIndicator";
 import TaskEdit from "./TaskEdit";
-import PageNotFound from "../PageNotFound";
+import PageNotFound, { PageNotFoundRoute } from "../PageNotFound";
 
 import { CachedCollection, getItemNavigationUid, getDecryptCollectionsFunction, getDecryptItemsFunction, PimFab, itemSave, itemDelete } from "../Pim/helpers";
 
@@ -185,10 +185,12 @@ export default function TasksMain() {
                 </div>
                 <Task item={item} />
               </Route>
+              <PageNotFoundRoute />
             </Switch>
           );
         }}
       />
+      <PageNotFoundRoute />
     </Switch>
   );
 }