diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index 40a4a14588..a1927f52b2 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -1,6 +1,8 @@
 import { CustomHead } from "@/next/components/Head";
 import { setupI18n } from "@/next/i18n";
 import { logUnhandledErrorsAndRejections } from "@/next/log-web";
+import { PAGES } from "@ente/accounts/constants/pages";
+import { accountLogout } from "@ente/accounts/services/logout";
 import { APPS, APP_TITLES } from "@ente/shared/apps/constants";
 import { Overlay } from "@ente/shared/components/Container";
 import DialogBoxV2 from "@ente/shared/components/DialogBoxV2";
@@ -27,6 +29,7 @@ interface AppContextProps {
     isMobile: boolean;
     showNavBar: (show: boolean) => void;
     setDialogBoxAttributesV2: SetDialogBoxAttributesV2;
+    logout: () => void;
 }
 
 export const AppContext = createContext<AppContextProps>({} as AppContextProps);
@@ -78,6 +81,10 @@ export default function App({ Component, pageProps }: AppProps) {
 
     const theme = getTheme(themeColor, APPS.PHOTOS);
 
+    const logout = () => {
+        void accountLogout().then(() => router.push(PAGES.ROOT));
+    };
+
     const title = isI18nReady
         ? t("TITLE", { context: APPS.ACCOUNTS })
         : APP_TITLES.get(APPS.ACCOUNTS);
@@ -101,6 +108,7 @@ export default function App({ Component, pageProps }: AppProps) {
                         showNavBar,
                         setDialogBoxAttributesV2:
                             setDialogBoxAttributesV2 as any,
+                        logout,
                     }}
                 >
                     {!isI18nReady && (
diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index 1ce3f3a5f2..a0a579a80a 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -130,9 +130,8 @@ export default function App({ Component, pageProps }: AppProps) {
             content: t("UNKNOWN_ERROR"),
         });
 
-    const logout = async () => {
-        await accountLogout();
-        router.push(PAGES.ROOT);
+    const logout = () => {
+        void accountLogout().then(() => router.push(PAGES.ROOT));
     };
 
     const title = isI18nReady
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index eacc713eb1..a22867173e 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -338,9 +338,8 @@ export default function App({ Component, pageProps }: AppProps) {
             content: t("UNKNOWN_ERROR"),
         });
 
-    const logout = async () => {
-        await photosLogout();
-        router.push(PAGES.ROOT);
+    const logout = () => {
+        void photosLogout().then(() => router.push(PAGES.ROOT));
     };
 
     const title = isI18nReady
diff --git a/web/packages/accounts/pages/credentials.tsx b/web/packages/accounts/pages/credentials.tsx
index 82306e992a..777fe97da6 100644
--- a/web/packages/accounts/pages/credentials.tsx
+++ b/web/packages/accounts/pages/credentials.tsx
@@ -52,7 +52,9 @@ import {
 } from "../services/srp";
 import { SRPAttributes } from "../types/srp";
 
-export default function Credentials({ appContext, appName, logout }: PageProps) {
+export default function Credentials({ appContext, appName }: PageProps) {
+    const { logout } = appContext;
+
     const [srpAttributes, setSrpAttributes] = useState<SRPAttributes>();
     const [keyAttributes, setKeyAttributes] = useState<KeyAttributes>();
     const [user, setUser] = useState<User>();
diff --git a/web/packages/accounts/pages/generate.tsx b/web/packages/accounts/pages/generate.tsx
index 20a10f4788..11c15a4f05 100644
--- a/web/packages/accounts/pages/generate.tsx
+++ b/web/packages/accounts/pages/generate.tsx
@@ -29,7 +29,9 @@ import {
 import { KeyAttributes, User } from "@ente/shared/user/types";
 import { useRouter } from "next/router";
 
-export default function Generate({ appContext, appName, logout }: PageProps) {
+export default function Generate({ appContext, appName }: PageProps) {
+    const { logout } = appContext;
+
     const [token, setToken] = useState<string>();
     const [user, setUser] = useState<User>();
     const [recoverModalView, setRecoveryModalView] = useState(false);
diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx
index 95d3d767cc..8ed187e0e5 100644
--- a/web/packages/accounts/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -31,8 +31,9 @@ bip39.setDefaultWordlist("english");
 export default function Recover({
     appContext,
     twoFactorType = TwoFactorType.TOTP,
-    logout,
 }: PageProps) {
+    const { logout } = appContext;
+
     const [encryptedTwoFactorSecret, setEncryptedTwoFactorSecret] =
         useState<B64EncryptionResult>(null);
     const [sessionID, setSessionID] = useState(null);
diff --git a/web/packages/accounts/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsx
index e927500629..1ec6e437d8 100644
--- a/web/packages/accounts/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -19,7 +19,11 @@ import { t } from "i18next";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 
-export const TwoFactorVerify: React.FC<PageProps> = ({ logout }: PageProps) => {
+export const TwoFactorVerify: React.FC<PageProps> = ({
+    appContext,
+}: PageProps) => {
+    const { logout } = appContext;
+
     const [sessionID, setSessionID] = useState("");
 
     const router = useRouter();
diff --git a/web/packages/accounts/pages/verify.tsx b/web/packages/accounts/pages/verify.tsx
index f49fca9f80..2a410fd6f2 100644
--- a/web/packages/accounts/pages/verify.tsx
+++ b/web/packages/accounts/pages/verify.tsx
@@ -32,7 +32,9 @@ import { PAGES } from "../constants/pages";
 import { configureSRP } from "../services/srp";
 import { SRPSetupAttributes } from "../types/srp";
 
-export default function VerifyPage({ appContext, appName, logout }: PageProps) {
+export default function VerifyPage({ appContext, appName }: PageProps) {
+    const { logout } = appContext;
+
     const [email, setEmail] = useState("");
     const [resend, setResend] = useState(0);
 
diff --git a/web/packages/shared/apps/types.ts b/web/packages/shared/apps/types.ts
index 37c193a980..bd3a2d4c5c 100644
--- a/web/packages/shared/apps/types.ts
+++ b/web/packages/shared/apps/types.ts
@@ -7,8 +7,8 @@ export interface PageProps {
         showNavBar: (show: boolean) => void;
         isMobile: boolean;
         setDialogBoxAttributesV2: SetDialogBoxAttributesV2;
+        logout: () => void;
     };
     appName: APPS;
     twoFactorType?: TwoFactorType;
-    logout: () => void;
 }