diff --git a/src/Navigation.tsx b/src/Navigation.tsx
index 817d69e332..f354ecbe7a 100644
--- a/src/Navigation.tsx
+++ b/src/Navigation.tsx
@@ -136,7 +136,7 @@ import {
   EmailDialogScreenID,
   useEmailDialogControl,
 } from '#/components/dialogs/EmailDialog'
-import {AnalyticsContext, useAnalytics, utils} from '#/analytics'
+import {useAnalytics} from '#/analytics'
 import {IS_NATIVE, IS_WEB} from '#/env'
 import {router} from '#/routes'
 import {Referrer} from '../modules/expo-bluesky-swiss-army'
@@ -1065,15 +1065,7 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
       // We will need to confirm we handle nested navigators correctly by the time we migrate to React Navigation 8.x
       // -sfn
       navigationInChildEnabled>
-      <AnalyticsContext
-        metadata={utils.useMeta({
-          navigation: {
-            previousScreen: prevLoggedRouteName.current,
-            currentScreen: getCurrentRouteName(),
-          },
-        })}>
-        {children}
-      </AnalyticsContext>
+      {children}
     </NavigationContainer>
   )
 }
diff --git a/src/view/shell/createNativeStackNavigatorWithAuth.tsx b/src/view/shell/createNativeStackNavigatorWithAuth.tsx
index 76f4f19ac0..6ce2dd3eef 100644
--- a/src/view/shell/createNativeStackNavigatorWithAuth.tsx
+++ b/src/view/shell/createNativeStackNavigatorWithAuth.tsx
@@ -37,6 +37,7 @@ import {Onboarding} from '#/screens/Onboarding'
 import {SignupQueued} from '#/screens/SignupQueued'
 import {atoms as a, useLayoutBreakpoints} from '#/alf'
 import {PolicyUpdateOverlay} from '#/components/PolicyUpdateOverlay'
+import {AnalyticsContext, utils} from '#/analytics'
 import {IS_NATIVE, IS_WEB} from '#/env'
 import {BottomBarWeb} from './bottom-bar/BottomBarWeb'
 import {DesktopLeftNav} from './desktop/LeftNav'
@@ -114,6 +115,11 @@ function NativeStackNavigator({
   const {setShowLoggedOut} = useLoggedOutViewControls()
   const {isMobile} = useWebMediaQueries()
   const {leftNavMinimal} = useLayoutBreakpoints()
+  const prevActiveRouteName = React.useRef<string | undefined>(undefined)
+  React.useEffect(() => {
+    prevActiveRouteName.current = activeRoute.name
+  }, [activeRoute.name])
+
   if (!hasSession && (activeRouteRequiresAuth || IS_NATIVE)) {
     return <LoggedOut />
   }
@@ -148,24 +154,32 @@ function NativeStackNavigator({
 
   return (
     <NavigationContent>
-      <View role="main" style={a.flex_1}>
-        <NativeStackView
-          {...rest}
-          state={state}
-          navigation={navigation}
-          descriptors={descriptors}
-          describe={describe}
-        />
-      </View>
-      {IS_WEB && (
-        <>
-          {showBottomBar ? <BottomBarWeb /> : <DesktopLeftNav />}
-          {!isMobile && <DesktopRightNav routeName={activeRoute.name} />}
-        </>
-      )}
+      <AnalyticsContext
+        metadata={utils.useMeta({
+          navigation: {
+            previousScreen: prevActiveRouteName.current,
+            currentScreen: activeRoute.name,
+          },
+        })}>
+        <View role="main" style={a.flex_1}>
+          <NativeStackView
+            {...rest}
+            state={state}
+            navigation={navigation}
+            descriptors={descriptors}
+            describe={describe}
+          />
+        </View>
+        {IS_WEB && (
+          <>
+            {showBottomBar ? <BottomBarWeb /> : <DesktopLeftNav />}
+            {!isMobile && <DesktopRightNav routeName={activeRoute.name} />}
+          </>
+        )}
 
-      {/* Only shown after logged in and onboaring etc are complete */}
-      {hasSession && <PolicyUpdateOverlay />}
+        {/* Only shown after logged in and onboaring etc are complete */}
+        {hasSession && <PolicyUpdateOverlay />}
+      </AnalyticsContext>
     </NavigationContent>
   )
 }