diff --git a/src/pages/primary/NoteListPage/index.tsx b/src/pages/primary/NoteListPage/index.tsx
index b1c6c4d..d743ff7 100644
--- a/src/pages/primary/NoteListPage/index.tsx
+++ b/src/pages/primary/NoteListPage/index.tsx
@@ -48,22 +48,11 @@ const NoteListPage = forwardRef((_, ref) => {
     }
   }, [relayUrls])
 
-  if (!feedInfo) {
-    return (
-      <PrimaryPageLayout
-        pageName="home"
-        ref={layoutRef}
-        titlebar={<NoteListPageTitlebar layoutRef={layoutRef} />}
-        displayScrollToTopButton
-      >
-        <WelcomeGuide />
-      </PrimaryPageLayout>
-    )
-  }
-
   let content: React.ReactNode = null
   if (!isReady) {
     content = <div className="text-center text-sm text-muted-foreground">{t('loading...')}</div>
+  } else if (!feedInfo) {
+    content = <WelcomeGuide />
   } else if (feedInfo.feedType === 'following' && !pubkey) {
     switchFeed(null)
     return null
@@ -89,7 +78,7 @@ const NoteListPage = forwardRef((_, ref) => {
           layoutRef={layoutRef}
           showRelayDetails={showRelayDetails}
           setShowRelayDetails={
-            feedInfo.feedType === 'relay' && !!feedInfo.id ? setShowRelayDetails : undefined
+            feedInfo?.feedType === 'relay' && !!feedInfo.id ? setShowRelayDetails : undefined
           }
         />
       }
diff --git a/src/providers/FeedProvider.tsx b/src/providers/FeedProvider.tsx
index b8cfe29..f9578f2 100644
--- a/src/providers/FeedProvider.tsx
+++ b/src/providers/FeedProvider.tsx
@@ -47,10 +47,13 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
         const storedFeedInfo = storage.getFeedInfo(pubkey)
         if (storedFeedInfo) {
           feedInfo = storedFeedInfo
+        } else {
+          feedInfo = { feedType: 'following' }
         }
       }
 
       if (!feedInfo) {
+        setIsReady(true)
         return
       }
 
@@ -71,12 +74,6 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
     init()
   }, [pubkey, isInitialized])
 
-  useEffect(() => {
-    if (pubkey && !feedInfo) {
-      switchFeed('following', { pubkey })
-    }
-  }, [pubkey, feedInfo])
-
   const switchFeed = async (
     feedType: TFeedType | null,
     options: {