diff --git a/src/components/App.tsx b/src/components/App.tsx
index b751827..a0146fb 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -9,6 +9,7 @@ import {
 	popLoginContinueURL,
 	setLoginContinueURL,
 } from './loginContinueUrl';
+import NotFound from './NotFound';
 import WheelShare from './WheelShare';
 import WheelShareLoggedOut from './WheelShareLoggedOut';
 
@@ -54,11 +55,11 @@ export default function App() {
 		>
 			<div style={style}>
 				<Suspense fallback={null}>
-					<BrowserRouter>
-						<Switch>
-							{user ? (
-								<NotificationsProvider>
-									<Header />
+					{user ? (
+						<NotificationsProvider>
+							<Header />
+							<BrowserRouter>
+								<Switch>
 									<Route path="/" exact component={WheelShare} />
 									<Route
 										path="/join/:code"
@@ -67,18 +68,19 @@ export default function App() {
 									<Route path="/carpools/:id" component={CarpoolPage} />
 									<Route path="/events/:id" component={EventPage} />
 									<Route path="/groups/:id" component={GroupPage} />
-								</NotificationsProvider>
-							) : (
-								<>
-									<WheelShareLoggedOut />
-									<Route
-										component={Authenticator}
-										path="/auth/:provider/callback"
-									/>
-								</>
-							)}
-						</Switch>
-					</BrowserRouter>
+									<Route path="/:url" component={NotFound} />
+								</Switch>
+							</BrowserRouter>
+						</NotificationsProvider>
+					) : (
+						<BrowserRouter>
+							<WheelShareLoggedOut />
+							<Route
+								component={Authenticator}
+								path="/auth/:provider/callback"
+							/>
+						</BrowserRouter>
+					)}
 				</Suspense>
 			</div>
 			<Footer />
diff --git a/src/components/NotFound.tsx b/src/components/NotFound.tsx
new file mode 100644
index 0000000..652438d
--- /dev/null
+++ b/src/components/NotFound.tsx
@@ -0,0 +1,8 @@
+export default function NotFound() {
+	return (
+		<div>
+			<h1>Not Found</h1>
+			<p>The page you're looking for does not exist.</p>
+		</div>
+	);
+}