diff --git a/src/state/preferences/index.tsx b/src/state/preferences/index.tsx
index bbb15675e4..405c9969db 100644
--- a/src/state/preferences/index.tsx
+++ b/src/state/preferences/index.tsx
@@ -9,6 +9,7 @@ import {Provider as InAppBrowserProvider} from './in-app-browser'
 import {Provider as KawaiiProvider} from './kawaii'
 import {Provider as LanguagesProvider} from './languages'
 import {Provider as StarterPackProvider} from './starter-pack'
+import {Provider as UsedStarterPacksProvider} from './used-starter-packs'
 
 export {
   useRequireAltTextEnabled,
@@ -34,7 +35,11 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
               <DisableHapticsProvider>
                 <AutoplayProvider>
                   <KawaiiProvider>
-                    <StarterPackProvider>{children}</StarterPackProvider>
+                    <StarterPackProvider>
+                      <UsedStarterPacksProvider>
+                        {children}
+                      </UsedStarterPacksProvider>
+                    </StarterPackProvider>
                   </KawaiiProvider>
                 </AutoplayProvider>
               </DisableHapticsProvider>
diff --git a/src/state/preferences/used-starter-packs.tsx b/src/state/preferences/used-starter-packs.tsx
index 8f3fd71822..65429b9169 100644
--- a/src/state/preferences/used-starter-packs.tsx
+++ b/src/state/preferences/used-starter-packs.tsx
@@ -9,16 +9,16 @@ const stateContext = React.createContext<StateContext>([])
 const setContext = React.createContext<SetContext>((_: string) => {})
 
 export function Provider({children}: {children: React.ReactNode}) {
-  const [state, setState] = React.useState<StateContext>()
+  const [state, setState] = React.useState<StateContext>([])
 
-  const setStateWrapped = (v: StateContext) => {
-    persisted.write('usedStarterPacks', [...state, v])
-    setState(prev => [...prev, v])
+  const setStateWrapped = (v: string) => {
+    persisted.write('usedStarterPacks', [...(state ? state : []), v])
+    setState(prev => [...(prev ? prev : []), v])
   }
 
   React.useEffect(() => {
     return persisted.onUpdate(() => {
-      setState(persisted.get('usedStarterPack'))
+      setState(persisted.get('usedStarterPacks'))
     })
   }, [])
 
diff --git a/src/view/screens/Home.tsx b/src/view/screens/Home.tsx
index 099151f07a..5447faed01 100644
--- a/src/view/screens/Home.tsx
+++ b/src/view/screens/Home.tsx
@@ -44,7 +44,7 @@ export function HomeScreen(props: Props) {
   const {setShowLoggedOut, requestSwitchToAccount} = useLoggedOutViewControls()
 
   React.useEffect(() => {
-    if (!currentStarterPack?.initialFeed) {
+    if (currentStarterPack && !currentStarterPack?.initialFeed) {
       setShowLoggedOut(true)
       requestSwitchToAccount({requestedAccount: 'starterpack'})
     }
@@ -52,6 +52,7 @@ export function HomeScreen(props: Props) {
     setShowLoggedOut,
     requestSwitchToAccount,
     currentStarterPack?.initialFeed,
+    currentStarterPack,
   ])
 
   if (preferences && pinnedFeedInfos && !isPinnedFeedsLoading) {