diff --git a/src/App.tsx b/src/App.tsx
index 654f5f8..42e2af1 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -82,7 +82,17 @@ export default function App() {
       ) : !user ? (
         <Routes>
           <Route path="/login" element={<LoginPage />} />
-          <Route path="*" element={<LoginPage />} />
+          <Route
+            path="*"
+            element={
+              <Navigate
+                to={`/login?next=${encodeURIComponent(
+                  location.pathname + location.search
+                )}`}
+                replace
+              />
+            }
+          />
         </Routes>
       ) : location.pathname.startsWith('/pure-chat') ? (
         <Routes>