diff --git a/src/stores/feed.js b/src/stores/feed.js
index 8f8c1dfd..fa5bc851 100644
--- a/src/stores/feed.js
+++ b/src/stores/feed.js
@@ -173,6 +173,7 @@ export const useFeedStore = defineStore('Feed', () => {
     function addFeed(feed) {
         notificationStore.queueFeedNoty(feed);
         feedSessionTable.value.push(feed);
+        feedSessionTable.value.shift();
         sharedFeedStore.updateSharedFeed(false);
         if (
             feedTable.value.filter.length > 0 &&
@@ -221,7 +222,14 @@ export const useFeedStore = defineStore('Feed', () => {
         feedTable.value.loading = true;
 
         feedTableLookup();
-        feedSessionTable.value = await database.getFeedDatabase();
+
+        const getFeedDatabaseResult = await database.getFeedDatabase();
+        if (getFeedDatabaseResult && getFeedDatabaseResult.length > 0) {
+            // rough, maybe 100 is enough
+            feedSessionTable.value = getFeedDatabaseResult.slice(-100);
+        } else {
+            feedSessionTable.value = [];
+        }
     }
 
     return {
diff --git a/src/views/FriendList/FriendList.vue b/src/views/FriendList/FriendList.vue
index 8ee6a985..6cdc7d53 100644
--- a/src/views/FriendList/FriendList.vue
+++ b/src/views/FriendList/FriendList.vue
@@ -320,7 +320,6 @@
     );
 
     function friendsListSearchChange() {
-        console.log('Friends List Search Change');
         friendsListLoading.value = true;
         let query = '';
         let cleanedQuery = '';