diff --git a/src/components/eventCollector.tsx b/src/components/eventCollector.tsx
index 24fd3548..d46ff190 100644
--- a/src/components/eventCollector.tsx
+++ b/src/components/eventCollector.tsx
@@ -125,7 +125,9 @@ export default function EventCollector() {
       if (unsubscribe.current) {
         unsubscribe.current();
       }
-      unlisten.current();
+      if (unlisten.current) {
+        unlisten.current;
+      }
     };
   }, [setHasNewerNote, subscribe, listenWindowClose]);
 
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index fe58caef..783c36b9 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -18,7 +18,6 @@ import {
   useContext,
   useEffect,
   useRef,
-  useState,
 } from 'react';
 
 export default function Page() {
@@ -133,9 +132,10 @@ export default function Page() {
         },
         undefined,
         () => {
-          eose.current += 1;
-          if (eose.current > relays.length / 2) {
+          if (eose.current > relays.length - 7) {
             router.replace('/newsfeed/following');
+          } else {
+            eose.current += 1;
           }
         }
       );
diff --git a/src/utils/metadata.tsx b/src/utils/metadata.tsx
index 2257d6a4..faf7ee78 100644
--- a/src/utils/metadata.tsx
+++ b/src/utils/metadata.tsx
@@ -1,5 +1,6 @@
+import useLocalStorage from '@rehooks/local-storage';
 import { fetch } from '@tauri-apps/api/http';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
 export const fetchMetadata = async (pubkey: string) => {
   const result = await fetch(`https://rbr.bio/${pubkey}/metadata.json`, {
@@ -10,32 +11,50 @@ export const fetchMetadata = async (pubkey: string) => {
 };
 
 export const useMetadata = (pubkey) => {
+  const [activeAccount]: any = useLocalStorage('activeAccount', {});
+  const [plebs] = useLocalStorage('activeAccountFollows', []);
   const [profile, setProfile] = useState(null);
 
-  const getCachedMetadata = useCallback(async () => {
-    const { getPlebByPubkey } = await import('@utils/bindings');
-    getPlebByPubkey({ pubkey: pubkey })
-      .then((res) => {
-        if (res && res.metadata.length > 0) {
-          const metadata = JSON.parse(res.metadata);
-          // update state
-          setProfile(metadata);
-        } else {
-          fetchMetadata(pubkey).then((res: any) => {
-            if (res) {
-              const metadata = JSON.parse(res.content);
-              // update state
-              setProfile(metadata);
-            }
-          });
-        }
-      })
-      .catch(console.error);
-  }, [pubkey]);
+  const cacheProfile = useMemo(() => {
+    const findInStorage = plebs.find((item) => item.pubkey === pubkey);
+
+    if (findInStorage !== undefined) {
+      return JSON.parse(findInStorage.metadata);
+    } else {
+      return false;
+    }
+  }, [plebs, pubkey]);
+
+  const insertPlebToDB = useCallback(
+    async (pubkey: string, metadata: string) => {
+      const { createPleb } = await import('@utils/bindings');
+      return await createPleb({
+        pleb_id: pubkey + '-lume' + activeAccount.id,
+        pubkey: pubkey,
+        kind: 1,
+        metadata: metadata,
+        account_id: activeAccount.id,
+      }).catch(console.error);
+    },
+    [activeAccount.id]
+  );
 
   useEffect(() => {
-    getCachedMetadata().catch(console.error);
-  }, [getCachedMetadata]);
+    if (!cacheProfile) {
+      fetchMetadata(pubkey)
+        .then((res: any) => {
+          // update state
+          setProfile(JSON.parse(res.content));
+          // save to db
+          insertPlebToDB(pubkey, res.content);
+        })
+        .catch(console.error);
+    }
+  }, [cacheProfile, insertPlebToDB, pubkey]);
 
-  return profile;
+  if (cacheProfile) {
+    return cacheProfile;
+  } else {
+    return profile;
+  }
 };