diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index 2cbd5b488d..4a7bcc4416 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -38,21 +38,18 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     const title = isI18nReady ? t("title_accounts") : staticAppTitle;
 
     return (
-        <>
+        <ThemeProvider theme={photosTheme}>
             <CustomHead {...{ title }} />
+            <CssBaseline enableColorScheme />
+            <AttributedMiniDialog {...miniDialogProps} />
 
-            <ThemeProvider theme={photosTheme}>
-                <CssBaseline enableColorScheme />
-                <AttributedMiniDialog {...miniDialogProps} />
-
-                <BaseContext value={baseContext}>
-                    <AppContext.Provider value={appContext}>
-                        {!isI18nReady && <LoadingIndicator />}
-                        {isI18nReady && <Component {...pageProps} />}
-                    </AppContext.Provider>
-                </BaseContext>
-            </ThemeProvider>
-        </>
+            <BaseContext value={baseContext}>
+                <AppContext.Provider value={appContext}>
+                    {!isI18nReady && <LoadingIndicator />}
+                    {isI18nReady && <Component {...pageProps} />}
+                </AppContext.Provider>
+            </BaseContext>
+        </ThemeProvider>
     );
 };
 
diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index 9879b4709e..143292aa67 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -59,30 +59,24 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     const title = isI18nReady ? t("title_auth") : staticAppTitle;
 
     return (
-        <>
+        <ThemeProvider theme={authTheme}>
             <CustomHead {...{ title }} />
+            <CssBaseline enableColorScheme />
+            <AttributedMiniDialog {...miniDialogProps} />
 
-            <ThemeProvider theme={authTheme}>
-                <CssBaseline enableColorScheme />
-
-                <AttributedMiniDialog {...miniDialogProps} />
-
-                <BaseContext value={baseContext}>
-                    <AppContext.Provider value={appContext}>
-                        {!isI18nReady ? (
-                            <LoadingIndicator />
-                        ) : (
-                            <>
-                                {isChangingRoute && (
-                                    <TranslucentLoadingOverlay />
-                                )}
-                                <Component {...pageProps} />
-                            </>
-                        )}
-                    </AppContext.Provider>
-                </BaseContext>
-            </ThemeProvider>
-        </>
+            <BaseContext value={baseContext}>
+                <AppContext.Provider value={appContext}>
+                    {!isI18nReady ? (
+                        <LoadingIndicator />
+                    ) : (
+                        <>
+                            {isChangingRoute && <TranslucentLoadingOverlay />}
+                            <Component {...pageProps} />
+                        </>
+                    )}
+                </AppContext.Provider>
+            </BaseContext>
+        </ThemeProvider>
     );
 };
 
diff --git a/web/apps/cast/src/pages/_app.tsx b/web/apps/cast/src/pages/_app.tsx
index 61c0af1341..3f3b8198e6 100644
--- a/web/apps/cast/src/pages/_app.tsx
+++ b/web/apps/cast/src/pages/_app.tsx
@@ -10,15 +10,14 @@ import React from "react";
 const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     useSetupLogs({ disableDiskLogs: true });
 
-    return (
-        <>
-            <CustomHead title={staticAppTitle} />
+    // We don't provide BaseContext. Nothing in the cast app needs it yet.
 
-            <ThemeProvider theme={castTheme}>
-                <CssBaseline enableColorScheme />
-                <Component {...pageProps} />
-            </ThemeProvider>
-        </>
+    return (
+        <ThemeProvider theme={castTheme}>
+            <CustomHead title={staticAppTitle} />
+            <CssBaseline enableColorScheme />
+            <Component {...pageProps} />
+        </ThemeProvider>
     );
 };
 
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 2b4f753a07..3d1c8c47d8 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -187,37 +187,32 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     const title = isI18nReady ? t("title_photos") : staticAppTitle;
 
     return (
-        <>
+        <ThemeProvider theme={photosTheme}>
             <CustomHead {...{ title }} />
+            <CssBaseline enableColorScheme />
+            <ThemedLoadingBar ref={loadingBarRef} />
 
-            <ThemeProvider theme={photosTheme}>
-                <CssBaseline enableColorScheme />
-                <ThemedLoadingBar ref={loadingBarRef} />
+            <AttributedMiniDialog
+                sx={{ zIndex: aboveFileViewerContentZ }}
+                {...miniDialogProps}
+            />
 
-                <AttributedMiniDialog
-                    sx={{ zIndex: aboveFileViewerContentZ }}
-                    {...miniDialogProps}
-                />
+            <Notification {...notificationProps} />
 
-                <Notification {...notificationProps} />
-
-                {isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
-                <BaseContext value={baseContext}>
-                    <AppContext.Provider value={appContext}>
-                        {!isI18nReady ? (
-                            <LoadingIndicator />
-                        ) : (
-                            <>
-                                {isChangingRoute && (
-                                    <TranslucentLoadingOverlay />
-                                )}
-                                <Component {...pageProps} />
-                            </>
-                        )}
-                    </AppContext.Provider>
-                </BaseContext>
-            </ThemeProvider>
-        </>
+            {isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
+            <BaseContext value={baseContext}>
+                <AppContext.Provider value={appContext}>
+                    {!isI18nReady ? (
+                        <LoadingIndicator />
+                    ) : (
+                        <>
+                            {isChangingRoute && <TranslucentLoadingOverlay />}
+                            <Component {...pageProps} />
+                        </>
+                    )}
+                </AppContext.Provider>
+            </BaseContext>
+        </ThemeProvider>
     );
 };