diff --git a/src/components/NoteList/index.tsx b/src/components/NoteList/index.tsx
index 3c23fa90..9971a446 100644
--- a/src/components/NoteList/index.tsx
+++ b/src/components/NoteList/index.tsx
@@ -60,14 +60,13 @@ export default function NoteList({
           onEvents: (events, eosed) => {
             if (events.length > 0) {
               setEvents(events)
-            } else {
-              setHasMore(false)
             }
             if (areAlgoRelays) {
               setHasMore(false)
             }
             if (eosed) {
               setInitialized(true)
+              setHasMore(events.length > 0)
             }
           },
           onNew: (event) => {
diff --git a/src/services/client.service.ts b/src/services/client.service.ts
index da1787a8..9355db43 100644
--- a/src/services/client.service.ts
+++ b/src/services/client.service.ts
@@ -292,9 +292,13 @@ class ClientService extends EventTarget {
         onEvents = () => {}
         onNew = () => {}
         subPromises.forEach((subPromise) => {
-          subPromise.then((sub) => {
-            sub.close()
-          })
+          subPromise
+            .then((sub) => {
+              sub.close()
+            })
+            .catch((err) => {
+              console.error(err)
+            })
         })
       }
     }