diff --git a/src/screens/Onboarding/StepFinished.tsx b/src/screens/Onboarding/StepFinished.tsx
index c13e7ed208..925d6004c0 100644
--- a/src/screens/Onboarding/StepFinished.tsx
+++ b/src/screens/Onboarding/StepFinished.tsx
@@ -137,6 +137,7 @@ export function StepFinished() {
         setUsedStarterPack({
           ...usedStarterPack,
           initialFeed: starterPack?.feeds?.[0].uri ?? 'following',
+          lastUsedUri: usedStarterPack.uri,
         })
       }
     } catch (e: any) {
diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx
index 5d0996447e..0736d0ff2f 100644
--- a/src/view/screens/Home.tsx
+++ b/src/view/screens/Home.tsx
@@ -98,7 +98,7 @@ function HomeScreenReady({
   const lastPagerReportedIndexRef = React.useRef(selectedIndex)
   React.useLayoutEffect(() => {
     let initialIndex = selectedIndex
-    if (usedStarterPack) {
+    if (usedStarterPack?.initialFeed) {
       if (usedStarterPack.initialFeed === 'following') {
         initialIndex = allFeeds.findIndex(f => f === 'following')
       } else {
@@ -109,7 +109,10 @@ function HomeScreenReady({
       if (initialIndex === -1) {
         initialIndex = 0
       }
-      setUsedStarterPack(undefined)
+      setUsedStarterPack({
+        ...usedStarterPack,
+        initialFeed: undefined,
+      })
     }
 
     // Since the pager is not a controlled component, adjust it imperatively