diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c492350e7..c233fd9cc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the
 # Unreleased
 ## [28.x.x]
 ### Changed
-
+- Add feature to Group starred Items per Feed
 
 ### Fixed
 - Special characters may be displayed incorrectly when full text is enabled
diff --git a/appinfo/routes.php b/appinfo/routes.php
index a94d7a5026..a3c8bb1510 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -22,6 +22,7 @@
 ['name' => 'page#index', 'url' => '/folder/{folderId}', 'verb' => 'GET', 'postfix' => 'view.folderid'],
 ['name' => 'page#index', 'url' => '/recent', 'verb' => 'GET', 'postfix' => 'view.recent'],
 ['name' => 'page#index', 'url' => '/starred', 'verb' => 'GET', 'postfix' => 'view.starred'],
+['name' => 'page#index', 'url' => '/starred/{feedId}', 'verb' => 'GET', 'postfix' => 'view.starred.feed'],
 ['name' => 'page#index', 'url' => '/unread', 'verb' => 'GET', 'postfix' => 'view.unread'],
 ['name' => 'page#settings', 'url' => '/settings', 'verb' => 'GET'],
 ['name' => 'page#update_settings', 'url' => '/settings', 'verb' => 'PUT'],
diff --git a/lib/Controller/ItemController.php b/lib/Controller/ItemController.php
index e87ffaf5b9..62c4216163 100644
--- a/lib/Controller/ItemController.php
+++ b/lib/Controller/ItemController.php
@@ -155,7 +155,8 @@ public function index(
                         $limit,
                         $offset,
                         $oldestFirst,
-                        $search_items
+                        $search_items,
+                        $id
                     );
                     break;
             }
diff --git a/lib/Db/Feed.php b/lib/Db/Feed.php
index 2f2b5f4046..e240de92d6 100644
--- a/lib/Db/Feed.php
+++ b/lib/Db/Feed.php
@@ -53,6 +53,8 @@ class Feed extends Entity implements IAPI, \JsonSerializable
     protected $folderId;
     /** @var int */
     protected $unreadCount;
+    /** @var int */
+    protected $starredCount;
     /** @var string|null */
     protected $link = null;
     /** @var bool */
@@ -322,6 +324,7 @@ public function jsonSerialize(): array
             'added',
             'folderId',
             'unreadCount',
+            'starredCount',
             'link',
             'preventUpdate',
             'deletedAt',
diff --git a/lib/Db/FeedMapperV2.php b/lib/Db/FeedMapperV2.php
index 0ba04b86ca..5432c806ed 100644
--- a/lib/Db/FeedMapperV2.php
+++ b/lib/Db/FeedMapperV2.php
@@ -52,20 +52,36 @@ public function __construct(IDBConnection $db, Time $time)
     public function findAllFromUser(string $userId, array $params = []): array
     {
         $builder = $this->db->getQueryBuilder();
-        $builder->select('feeds.*', $builder->func()->count('items.id', 'unreadCount'))
+        $builder
+            ->select('feeds.*')
+            ->selectAlias(
+                $builder->createFunction('COUNT(DISTINCT items_unread.id)'),
+                'unreadCount'
+            )
+            ->selectAlias(
+                $builder->createFunction('COUNT(DISTINCT items_starred.id)'),
+                'starredCount'
+            )
             ->from(static::TABLE_NAME, 'feeds')
             ->leftJoin(
                 'feeds',
                 ItemMapperV2::TABLE_NAME,
-                'items',
-                'items.feed_id = feeds.id AND items.unread = :unread'
+                'items_unread',
+                'items_unread.feed_id = feeds.id AND items_unread.unread = :unread'
+            )
+            ->leftJoin(
+                'feeds',
+                ItemMapperV2::TABLE_NAME,
+                'items_starred',
+                'items_starred.feed_id = feeds.id AND items_starred.starred = :starred'
             )
             ->where('feeds.user_id = :user_id')
             ->andWhere('feeds.deleted_at = 0')
             ->groupBy('feeds.id')
             ->setParameter('unread', true, IQueryBuilder::PARAM_BOOL)
+            ->setParameter('starred', true, IQueryBuilder::PARAM_BOOL)
             ->setParameter('user_id', $userId)
-            ->addOrderBy('title');
+            ->addOrderBy('feeds.title');
 
         return $this->findEntities($builder);
     }
diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php
index 7c70c68798..f7341ca409 100644
--- a/lib/Db/ItemMapperV2.php
+++ b/lib/Db/ItemMapperV2.php
@@ -556,6 +556,7 @@ public function findAllFolder(
      * @throws ServiceValidationException
      */
     public function findAllItems(
+        int $feedId,
         string $userId,
         int $type,
         int $limit,
@@ -588,6 +589,10 @@ public function findAllItems(
             case ListType::STARRED:
                 $builder->andWhere('items.starred = :starred')
                         ->setParameter('starred', true);
+                if ($feedId !== 0) {
+                    $builder->andWhere('items.feed_id = :feedId')
+                            ->setParameter('feedId', $feedId);
+                }
                 break;
             case ListType::UNREAD:
                 $builder->andWhere('items.unread = :unread')
diff --git a/lib/Service/ItemServiceV2.php b/lib/Service/ItemServiceV2.php
index 7fbd5e82c5..ff79d7e623 100644
--- a/lib/Service/ItemServiceV2.php
+++ b/lib/Service/ItemServiceV2.php
@@ -388,8 +388,9 @@ public function findAllWithFilters(
         int $limit,
         int $offset,
         bool $oldestFirst,
-        array $search = []
+        array $search = [],
+        int $id = 0
     ): array {
-        return $this->mapper->findAllItems($userId, $type, $limit, $offset, $oldestFirst, $search);
+        return $this->mapper->findAllItems($id, $userId, $type, $limit, $offset, $oldestFirst, $search);
     }
 }
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 121166eeb8..c7fd59fc1c 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -48,7 +48,27 @@
 					<HistoryIcon />
 				</template>
 			</NcAppNavigationItem>
-			<NcAppNavigationItem :name="t('news', 'Starred')" icon="icon-starred" :to="{ name: ROUTES.STARRED }">
+			<NcAppNavigationItem
+				:name="t('news', 'Starred')"
+				icon="icon-starred"
+				:to="{ name: ROUTES.STARRED }"
+				:allow-collapse="true"
+				:force-menu="true"
+				:open="wasStarredVisited">
+				<NcAppNavigationItem
+					v-for="group in GroupedStars"
+					:key="group.id"
+					:ref="'starred-' + group.id"
+					:name="group.title"
+					:to="{ name: ROUTES.STARRED, params: { feedId: group.id } }">
+					<template #icon>
+						<RssIcon v-if="!group.faviconLink" />
+						<span v-else style="width: 16px; height: 16px; background-size: contain;" :style="{ backgroundImage: 'url(' + group.faviconLink + ')' }" />
+					</template>
+					<template #counter>
+						<NcCounterBubble :count="group.starredCount" />
+					</template>
+				</NcAppNavigationItem>
 				<template #counter>
 					<NcCounterBubble :count="items.starredCount" />
 				</template>
@@ -351,6 +371,7 @@ export default defineComponent({
 			polling: null,
 			uploadStatus: null,
 			selectedFile: null,
+			wasStarredVisited: false,
 			displayModeOptions: [
 				{
 					id: '0',
@@ -408,6 +429,10 @@ export default defineComponent({
 			return navItems
 		},
 
+		GroupedStars(): Array<Feed> {
+			return this.$store.getters.feeds.filter((item: Feed) => item.starredCount !== 0)
+		},
+
 		loading: {
 			get() {
 				return this.$store.getters.loading
@@ -512,6 +537,17 @@ export default defineComponent({
 				}
 			},
 		},
+
+		// Watch route changes and set `wasStarredVisited`
+		$route: {
+			handler(to) {
+				if (to.name === this.ROUTES.STARRED && (to.params && to.params.feedId)) {
+					this.wasStarredVisited = true
+				}
+			},
+
+			immediate: true,
+		},
 	},
 
 	created() {
diff --git a/src/components/routes/Starred.vue b/src/components/routes/Starred.vue
index 442ea6317b..39a3154f34 100644
--- a/src/components/routes/Starred.vue
+++ b/src/components/routes/Starred.vue
@@ -1,14 +1,15 @@
 <template>
 	<ContentTemplate
 		v-if="!loading"
+		:list-name="starredFeed ? starredFeed.title : t('news', 'Starred')"
+		:list-count="starredFeed ? starredFeed.starredCount : items.starredCount"
 		:items="starred"
-		:list-name="t('news', 'Starred')"
-		:list-count="items.starredCount"
-		fetch-key="starred"
+		:fetch-key="fetchKey"
 		@load-more="fetchMore()" />
 </template>
 
 <script lang="ts">
+import type { Feed } from '../../types/Feed.ts'
 import type { FeedItem } from '../../types/FeedItem.ts'
 
 import { defineComponent } from 'vue'
@@ -23,10 +24,29 @@ export default defineComponent({
 		ContentTemplate,
 	},
 
+	props: {
+		/**
+		 * Unique identifier of the feed whose starred entries this component displays.
+		 *
+		 * @type {string}
+		 *
+		 * Used to fetch the relevant entries from the backend and to filter the displayed items.
+		 */
+		feedId: {
+			type: String,
+			required: false,
+			default: undefined,
+		},
+	},
+
 	computed: {
 		...mapState(['items']),
 		starred(): FeedItem[] {
-			let items = this.$store.getters.starred
+			const starred = this.$store.getters.starred
+
+			let items = this.feedId
+				? starred.filter((item: FeedItem) => item.feedId === this.id)
+				: starred
 			/*
 			 * Sorting items is needed because the allItems array can contain
 			 * different orderings due to possible individual feed sorting
@@ -42,6 +62,20 @@ export default defineComponent({
 		oldestFirst() {
 			return this.$store.getters.oldestFirst
 		},
+
+		id(): number {
+			return this.feedId ? Number(this.feedId) : 0
+		},
+
+		fetchKey(): string {
+			return this.feedId ? 'starred-' + this.feedId : 'starred'
+		},
+
+		starredFeed(): Feed {
+			return this.feedId
+				? this.$store.getters.feeds.find((feed: Feed) => feed.id === this.id)
+				: undefined
+		},
 	},
 
 	created() {
@@ -49,14 +83,14 @@ export default defineComponent({
 		 * When sorting newest to oldest lastItemLoaded needs to be reset to get new items for this route
 		 */
 		if (this.oldestFirst === false) {
-			this.$store.commit(MUTATIONS.SET_LAST_ITEM_LOADED, { key: 'starred', lastItem: undefined })
+			this.$store.commit(MUTATIONS.SET_LAST_ITEM_LOADED, { key: this.fetchKey, lastItem: undefined })
 		}
 	},
 
 	methods: {
 		async fetchMore() {
-			if (!this.$store.state.items.fetchingItems.starred) {
-				this.$store.dispatch(ACTIONS.FETCH_STARRED)
+			if (!this.$store.state.items.fetchingItems[this.fetchKey]) {
+				this.$store.dispatch(ACTIONS.FETCH_STARRED, { feedId: this.id })
 			}
 		},
 	},
diff --git a/src/dataservices/item.service.ts b/src/dataservices/item.service.ts
index a63586dd81..4435ac0029 100644
--- a/src/dataservices/item.service.ts
+++ b/src/dataservices/item.service.ts
@@ -39,10 +39,11 @@ export class ItemService {
 	/**
 	 * Makes backend call to retrieve starred items
 	 *
+	 * @param feedId (id of the feed to retrieve starred items for)
 	 * @param start (id of last starred item loaded)
 	 * @return response object containing backend request response
 	 */
-	static async fetchStarred(start: number): Promise<AxiosResponse> {
+	static async fetchStarred(feedId: number, start: number): Promise<AxiosResponse> {
 		return await axios.get(API_ROUTES.ITEMS, {
 			params: {
 				limit: 40,
@@ -51,6 +52,7 @@ export class ItemService {
 				showAll: store.state.showAll,
 				type: ITEM_TYPES.STARRED,
 				offset: start,
+				...(feedId !== 0 ? { id: feedId } : {}),
 			},
 		})
 	}
diff --git a/src/routes/index.ts b/src/routes/index.ts
index ef6ce0557e..42539f09df 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -63,7 +63,7 @@ const routes = [
 	},
 	{
 		name: ROUTES.STARRED,
-		path: '/starred',
+		path: '/starred/:feedId?',
 		component: StarredPanel,
 		props: true,
 	},
diff --git a/src/store/feed.ts b/src/store/feed.ts
index 54ac44a802..fd9cc30f11 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -305,6 +305,18 @@ export const mutations = {
 		}
 	},
 
+	[FEED_MUTATION_TYPES.MODIFY_STARRED_COUNT](
+		state: FeedState,
+		{ feedId, add }: { feedId: number, add: boolean },
+	) {
+		const feed = state.feeds.find((feed: Feed) => {
+			return feed.id === feedId
+		})
+		if (feed) {
+			_.assign(feed, { starredCount: feed.starredCount + (add ? 1 : -1) })
+		}
+	},
+
 	[FEED_MUTATION_TYPES.FEED_DELETE](
 		state: FeedState,
 		feedId: number,
diff --git a/src/store/item.ts b/src/store/item.ts
index 4ee8025cf6..3bf987070f 100644
--- a/src/store/item.ts
+++ b/src/store/item.ts
@@ -171,17 +171,19 @@ export const actions = {
 	 * @param param0 ActionParams
 	 * @param param0.commit Commit param
 	 * @param param1 ActionArgs
+	 * @param param1.feedId ID of the feed
 	 * @param param1.start Start data
 	 */
 	async [FEED_ITEM_ACTION_TYPES.FETCH_STARRED](
 		{ commit }: ActionParams<ItemState>,
-		{ start }: { start: number } = { start: 0 },
+		{ feedId, start }: { feedId: number, start: number } = { feedId: 0, start: 0 },
 	) {
 		const requestId = Date.now()
 		latestFetchRequest = requestId
 
-		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'starred', fetching: true })
-		const response = await ItemService.fetchStarred(start || state.lastItemLoaded.starred)
+		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'starred-' + feedId, fetching: true })
+
+		const response = await ItemService.fetchStarred(feedId, start || state.lastItemLoaded['starred-' + feedId])
 
 		// skip response if outdated
 		if (latestFetchRequest !== requestId) {
@@ -198,15 +200,15 @@ export const actions = {
 		}
 
 		if (response?.data.items.length < 40) {
-			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'starred', loaded: true })
+			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'starred-' + feedId, loaded: true })
 		} else {
-			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'starred', loaded: false })
+			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'starred-' + feedId, loaded: false })
 		}
 		if (response?.data.items.length > 0) {
 			const lastItem = response?.data.items[response?.data.items.length - 1].id
-			commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'starred', lastItem })
+			commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'starred-' + feedId, lastItem })
 		}
-		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'starred', fetching: false })
+		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'starred-' + feedId, fetching: false })
 	},
 
 	/**
@@ -354,8 +356,10 @@ export const actions = {
 		ItemService.markStarred(item, true)
 
 		item.starred = true
+		const feedId = item.feedId
 		commit(FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM, { item })
 		commit(FEED_ITEM_MUTATION_TYPES.SET_STARRED_COUNT, state.starredCount + 1)
+		commit(FEED_MUTATION_TYPES.MODIFY_STARRED_COUNT, { feedId, add: true })
 	},
 
 	/**
@@ -373,8 +377,10 @@ export const actions = {
 		ItemService.markStarred(item, false)
 
 		item.starred = false
+		const feedId = item.feedId
 		commit(FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM, { item })
 		commit(FEED_ITEM_MUTATION_TYPES.SET_STARRED_COUNT, state.starredCount - 1)
+		commit(FEED_MUTATION_TYPES.MODIFY_STARRED_COUNT, { feedId, add: false })
 	},
 }
 
diff --git a/src/types/Feed.ts b/src/types/Feed.ts
index 2132bf21a2..3bcf46531b 100644
--- a/src/types/Feed.ts
+++ b/src/types/Feed.ts
@@ -3,6 +3,7 @@ import type { FEED_ORDER, FEED_UPDATE_MODE } from '../enums/index.ts'
 export type Feed = {
 	folderId?: number
 	unreadCount: number
+	starredCount: number
 	url: string
 	title?: string
 	autoDiscover?: boolean
diff --git a/src/types/MutationTypes.ts b/src/types/MutationTypes.ts
index 5fbcc00f59..5f9d0ebda8 100644
--- a/src/types/MutationTypes.ts
+++ b/src/types/MutationTypes.ts
@@ -7,6 +7,7 @@ export const FEED_MUTATION_TYPES = {
 	SET_NEWEST_ITEM_ID: 'SET_NEWEST_ITEM_ID',
 	SET_FEED_ALL_READ: 'SET_FEED_ALL_READ',
 	MODIFY_FEED_UNREAD_COUNT: 'MODIFY_FEED_UNREAD_COUNT',
+	MODIFY_STARRED_COUNT: 'MODIFY_STARRED_COUNT',
 
 	FEED_DELETE: 'FEED_DELETE',
 }
diff --git a/tests/Unit/Db/FeedMapperTest.php b/tests/Unit/Db/FeedMapperTest.php
index 2b53fcbd40..2e6166e700 100644
--- a/tests/Unit/Db/FeedMapperTest.php
+++ b/tests/Unit/Db/FeedMapperTest.php
@@ -68,24 +68,30 @@ public function testFindAllFromUser()
                  ->method('getQueryBuilder')
                  ->willReturn($this->builder);
 
-        $funcbuilder = $this->getMockBuilder(IFunctionBuilder::class)
-                            ->getMock();
+        $funcUnread = $this->getMockBuilder(IQueryFunction::class)
+                      ->getMock();
+        $funcStarred = $this->getMockBuilder(IQueryFunction::class)
+                      ->getMock();
 
-        $func = $this->getMockBuilder(IQueryFunction::class)
-                     ->getMock();
-
-        $funcbuilder->expects($this->once())
-                    ->method('count')
-                    ->with('items.id', 'unreadCount')
-                    ->will($this->returnValue($func));
+        $this->builder->expects($this->exactly(2))
+                ->method('createFunction')
+                ->withConsecutive(
+                ['COUNT(DISTINCT items_unread.id)'],
+                ['COUNT(DISTINCT items_starred.id)']
+                )
+                ->willReturnOnConsecutiveCalls($funcUnread, $funcStarred);
 
         $this->builder->expects($this->once())
-                      ->method('func')
-                      ->will($this->returnValue($funcbuilder));
+                  ->method('select')
+                  ->with('feeds.*')
+                  ->will($this->returnSelf());
 
-        $this->builder->expects($this->once())
-                      ->method('select')
-                      ->with('feeds.*', $func)
+        $this->builder->expects($this->exactly(2))
+                      ->method('selectAlias')
+                      ->withConsecutive(
+                      [$funcUnread, 'unreadCount'],
+                      [$funcStarred, 'starredCount']
+                      )
                       ->will($this->returnSelf());
 
         $this->builder->expects($this->once())
@@ -93,9 +99,12 @@ public function testFindAllFromUser()
                       ->with('news_feeds', 'feeds')
                       ->will($this->returnSelf());
 
-        $this->builder->expects($this->once())
+        $this->builder->expects($this->exactly(2))
                       ->method('leftJoin')
-                      ->with('feeds', 'news_items', 'items', 'items.feed_id = feeds.id AND items.unread = :unread')
+                      ->withConsecutive(
+                        ['feeds', 'news_items', 'items_unread', 'items_unread.feed_id = feeds.id AND items_unread.unread = :unread'],
+                        ['feeds', 'news_items', 'items_starred', 'items_starred.feed_id = feeds.id AND items_starred.starred = :starred']
+                      )
                       ->will($this->returnSelf());
 
         $this->builder->expects($this->once())
@@ -113,9 +122,9 @@ public function testFindAllFromUser()
                       ->with('feeds.id')
                       ->will($this->returnSelf());
 
-        $this->builder->expects($this->exactly(2))
+        $this->builder->expects($this->exactly(3))
                       ->method('setParameter')
-                      ->withConsecutive(['unread', true], ['user_id', 'jack'])
+                      ->withConsecutive(['unread', true], ['starred', true], ['user_id', 'jack'])
                       ->will($this->returnSelf());
 
         $this->builder->expects($this->once())
diff --git a/tests/Unit/Db/FeedTest.php b/tests/Unit/Db/FeedTest.php
index 3b057a7186..b24b9ab6d6 100644
--- a/tests/Unit/Db/FeedTest.php
+++ b/tests/Unit/Db/FeedTest.php
@@ -109,11 +109,11 @@ public function testSerialize()
             'folderId' => 1,
             'unreadCount' => 321,
             'link' => 'https://www.google.com/some/weird/path',
-            'userId' => null,
+            'userId' => '',
             'urlHash' => '44168618f55392b145629d6b3922e84b',
-            'preventUpdate' => null,
-            'deletedAt' => null,
-            'articlesPerUpdate' => null,
+            'preventUpdate' => false,
+            'deletedAt' => 0,
+            'articlesPerUpdate' => 0,
             'cssClass' => 'custom-google-com',
             'location' => 'http://google.at',
             'ordering' => 2,
@@ -124,8 +124,9 @@ public function testSerialize()
             'lastUpdateError' => 'hi',
             'basicAuthUser' => 'user',
             'basicAuthPassword' => 'password',
-            'nextUpdateTime' => '',
+            'nextUpdateTime' => null,
             'lastModified' => '0',
+            'starredCount' => null,
             ],
             $feed->jsonSerialize()
         );
diff --git a/tests/Unit/Db/ItemMapperPaginatedTest.php b/tests/Unit/Db/ItemMapperPaginatedTest.php
index 5e331fbfdc..31f2350ae4 100644
--- a/tests/Unit/Db/ItemMapperPaginatedTest.php
+++ b/tests/Unit/Db/ItemMapperPaginatedTest.php
@@ -108,7 +108,7 @@ public function testFindAllItemsInvalid()
                 false
             );
 
-        $this->class->findAllItems('jack', 232, 10, 10, false, []);
+        $this->class->findAllItems(0, 'jack', 232, 10, 10, false, []);
     }
 
     public function testFindAllItemsFullInverted()
@@ -174,7 +174,7 @@ public function testFindAllItemsFullInverted()
                 false
             );
 
-        $result = $this->class->findAllItems('jack', 3, 10, 10, true, []);
+        $result = $this->class->findAllItems(0, 'jack', 3, 10, 10, true, []);
         $this->assertEquals([Item::fromRow(['id' => 4])], $result);
     }
 
@@ -245,7 +245,7 @@ public function testFindAllItemsUnread()
                 false
             );
 
-        $result = $this->class->findAllItems('jack', 6, 10, 10, false, []);
+        $result = $this->class->findAllItems(0, 'jack', 6, 10, 10, false, []);
         $this->assertEquals([Item::fromRow(['id' => 4])], $result);
     }
 
@@ -314,7 +314,7 @@ public function testFindAllItemsUnreadNoLimit()
                 false
             );
 
-        $result = $this->class->findAllItems('jack', 6, -1, 10, false, []);
+        $result = $this->class->findAllItems(0, 'jack', 6, -1, 10, false, []);
         $this->assertEquals([Item::fromRow(['id' => 4])], $result);
     }
 
@@ -386,7 +386,7 @@ public function testFindAllItemsStarred()
                 false
             );
 
-        $result = $this->class->findAllItems('jack', 2, 10, 10, false, []);
+        $result = $this->class->findAllItems(0, 'jack', 2, 10, 10, false, []);
         $this->assertEquals([Item::fromRow(['id' => 4])], $result);
     }
 
@@ -470,7 +470,7 @@ public function testFindAllItemsStarredSearch()
                 false
             );
 
-        $result = $this->class->findAllItems('jack', 2, 10, 10, false, ['key', 'word']);
+        $result = $this->class->findAllItems(0, 'jack', 2, 10, 10, false, ['key', 'word']);
         $this->assertEquals([Item::fromRow(['id' => 4])], $result);
     }
 
diff --git a/tests/Unit/Service/ItemServiceTest.php b/tests/Unit/Service/ItemServiceTest.php
index 5a6de1f176..d63f99341a 100644
--- a/tests/Unit/Service/ItemServiceTest.php
+++ b/tests/Unit/Service/ItemServiceTest.php
@@ -187,7 +187,7 @@ public function testFindAllItems()
         $type = ListType::STARRED;
         $this->mapper->expects($this->once())
             ->method('findAllItems')
-            ->with('jack', $type, 20, 5, true, [])
+            ->with(0, 'jack', $type, 20, 5, true, [])
             ->will($this->returnValue(['val']));
 
         $result = $this->class->findAllWithFilters('jack', $type, 20, 5, true);
@@ -202,7 +202,7 @@ public function testFindAllSearch()
 
         $this->mapper->expects($this->once())
             ->method('findAllItems')
-            ->with('jack', $type, 20, 5, true, $search)
+            ->with(0, 'jack', $type, 20, 5, true, $search)
             ->will($this->returnValue(['val']));
 
         $result = $this->class->findAllWithFilters('jack', $type, 20, 5, true, $search);
diff --git a/tests/javascript/unit/components/Sidebar.spec.ts b/tests/javascript/unit/components/Sidebar.spec.ts
index ed636070a0..98c48c7b97 100644
--- a/tests/javascript/unit/components/Sidebar.spec.ts
+++ b/tests/javascript/unit/components/Sidebar.spec.ts
@@ -211,6 +211,25 @@ describe('Sidebar.vue', () => {
 
 			expect(topLevelNav[0].name).toEqual('feed3')
 		})
+
+		it('should set wasStarredVisited when route is STARRED with feedId param', () => {
+			wrapper.vm.wasStarredVisited = false
+			wrapper.vm.$options.watch?.$route.handler.call(wrapper.vm, { name: 'starred', params: { feedId: '123' } })
+			expect(wrapper.vm.wasStarredVisited).toBe(true)
+		})
+
+		it('should set wasStarredVisited when route is STARRED with feedId param and stay set after a change', () => {
+			wrapper.vm.wasStarredVisited = false
+			wrapper.vm.$options.watch?.$route.handler.call(wrapper.vm, { name: 'starred', params: { feedId: '123' } })
+			wrapper.vm.$options.watch?.$route.handler.call(wrapper.vm, { name: 'fee', params: { feedId: '123' } })
+			expect(wrapper.vm.wasStarredVisited).toBe(true)
+		})
+
+		it('should NOT set wasStarredVisited when route is STARRED without feedId param', () => {
+			wrapper.vm.wasStarredVisited = false
+			wrapper.vm.$options.watch?.$route.handler.call(wrapper.vm, { name: 'starred' })
+			expect(wrapper.vm.wasStarredVisited).toBe(false)
+		})
 	})
 
 	describe('Methods', () => {
@@ -221,6 +240,127 @@ describe('Sidebar.vue', () => {
 		})
 	})
 
+	describe('computed properties', () => {
+		it('should return only feeds with starredCount for GroupedStars', () => {
+			const mockFeeds = [{ id: 1, title: 'Feed A', starredCount: 0 }, { id: 2, title: 'Feed B', starredCount: 3 }, { id: 3, title: 'Feed C', starredCount: 1 }]
+
+			const mockStore: any = {
+				getters: {
+					feeds: mockFeeds,
+					folders: [],
+					loading: false,
+					displaymode: '0',
+					splitmode: '0',
+					oldestFirst: false,
+					preventReadOnScroll: true,
+					showAll: false,
+					disableRefresh: true, // avoid setInterval in created()
+					items: { unreadCount: 0, starredCount: 0 },
+				},
+				dispatch: vi.fn(),
+				commit: vi.fn(),
+			}
+
+			const wrapper = shallowMount(AppSidebar as any, {
+				global: {
+					mocks: {
+						$store: mockStore,
+						t: (_ns: string, msg: string) => msg,
+						$route: { name: '', params: {} },
+						$router: { push: vi.fn() },
+					},
+					stubs: true,
+				},
+			})
+
+			const grouped = (wrapper.vm as any).GroupedStars
+			expect(Array.isArray(grouped)).toBe(true)
+			expect(grouped.length).toBe(2)
+			expect(grouped.map((g: any) => g.id).sort()).toEqual([2, 3])
+		})
+
+		it('should load getter reflects store.getters.loading', () => {
+			const mockStore: any = {
+				getters: {
+					feeds: [],
+					folders: [],
+					loading: true,
+					displaymode: '0',
+					splitmode: '0',
+					oldestFirst: false,
+					preventReadOnScroll: true,
+					showAll: false,
+					disableRefresh: true,
+					items: { unreadCount: 0, starredCount: 0 },
+				},
+				dispatch: vi.fn(),
+				commit: vi.fn(),
+			}
+
+			const wrapper = shallowMount(AppSidebar as any, {
+				global: {
+					mocks: {
+						$store: mockStore,
+						t: (_ns: string, msg: string) => msg,
+						$route: { name: '', params: {} },
+						$router: { push: vi.fn() },
+					},
+					stubs: true,
+				},
+			})
+
+			expect((wrapper.vm as any).loading).toBe(true)
+		})
+
+		it('should renders RssIcon when no faviconLink and fallback span when faviconLink present for GroupedStars', () => {
+			const mockFeeds = [
+				{ id: 2, title: 'group-no-favicon', starredCount: 1, faviconLink: null },
+				{ id: 3, title: 'group-with-favicon', starredCount: 2, faviconLink: 'https://example.com/favicon.png' },
+			]
+
+			const mockStore: any = {
+				getters: {
+					feeds: mockFeeds,
+					folders: [],
+					loading: false,
+					displaymode: '0',
+					splitmode: '0',
+					oldestFirst: false,
+					preventReadOnScroll: true,
+					showAll: false,
+					disableRefresh: true,
+					items: { unreadCount: 0, starredCount: 0 },
+				},
+				dispatch: vi.fn(),
+				commit: vi.fn(),
+			}
+
+			// shallowMount with simple stubs — we only need computed GroupedStars here
+			const wrapper = shallowMount(AppSidebar as any, {
+				global: {
+					mocks: {
+						$store: mockStore,
+						t: (_ns: string, msg: string) => msg,
+						$route: { name: '', params: {} },
+						$router: { push: vi.fn() },
+					},
+					stubs: true,
+				},
+			})
+
+			// use computed GroupedStars to assert the branching data (covers the v-if decision)
+			const grouped = (wrapper.vm as any).GroupedStars
+			expect(Array.isArray(grouped)).toBe(true)
+			expect(grouped.length).toBe(2)
+
+			// first group has no faviconLink -> template should render RssIcon (v-if="!group.faviconLink")
+			expect(grouped[0].faviconLink).toBeNull()
+
+			// second group has a faviconLink -> template should render background-image span
+			expect(grouped[1].faviconLink).toBe('https://example.com/favicon.png')
+		})
+	})
+
 	// TODO: More Template Testing with https://test-utils.vuejs.org/guide/essentials/a-crash-course.html#adding-a-new-todo
 
 	afterEach(() => {
diff --git a/tests/javascript/unit/components/routes/Starred.spec.ts b/tests/javascript/unit/components/routes/Starred.spec.ts
index c0180f1882..13bcab4821 100644
--- a/tests/javascript/unit/components/routes/Starred.spec.ts
+++ b/tests/javascript/unit/components/routes/Starred.spec.ts
@@ -47,11 +47,13 @@ describe('Starred.vue', () => {
 			state: {
 				items: {
 					fetchingItems: {
+						'starred-0': false,
 						starred: false,
 					},
 					lastItemLoaded: {
 						starred: 1,
 					},
+					starredCount: undefined,
 				},
 				feeds: {
 				},
@@ -64,15 +66,28 @@ describe('Starred.vue', () => {
 			getters: {
 				starred: () => mockItems,
 				oldestFirst: (state) => state.app.oldestFirst,
+				loading: () => false,
 			},
 		})
 
 		store.dispatch = vi.fn()
 		store.commit = vi.fn()
 
+		// stub NcCounterBubble and ContentTemplate so counter and props are queryable
 		wrapper = shallowMount(Starred, {
 			global: {
 				plugins: [store],
+				stubs: {
+					NcCounterBubble: {
+						props: ['count'],
+						template: '<span class="nc-counter" :data-count="count">{{ count }}</span>',
+					},
+					// declare props so wrapper.findComponent(ContentTemplate).props() contains items/fetchKey
+					ContentTemplate: {
+						props: ['items', 'fetchKey'],
+						template: '<div><slot name="header"></slot><slot /></div>',
+					},
+				},
 			},
 		})
 	})
@@ -88,14 +103,14 @@ describe('Starred.vue', () => {
 	it('should get only first item from state ordering oldest>newest', async () => {
 		wrapper.vm.$store.state.items.lastItemLoaded.starred = 1
 		wrapper.vm.$store.state.app.oldestFirst = true
-		await nextTick
+		await nextTick()
 		expect((wrapper.findComponent(ContentTemplate)).props().items.length).toEqual(1)
 	})
 
 	it('should get only first item from state ordering newest>oldest', async () => {
 		wrapper.vm.$store.state.items.lastItemLoaded.starred = 4
 		wrapper.vm.$store.state.app.oldestFirst = false
-		await nextTick
+		await nextTick()
 		expect((wrapper.findComponent(ContentTemplate)).props().items.length).toEqual(1)
 	})
 
diff --git a/tests/javascript/unit/services/item.service.spec.ts b/tests/javascript/unit/services/item.service.spec.ts
index e773693718..97f9d555c9 100644
--- a/tests/javascript/unit/services/item.service.spec.ts
+++ b/tests/javascript/unit/services/item.service.spec.ts
@@ -1,6 +1,7 @@
 import axios from '@nextcloud/axios'
 import { beforeEach, describe, expect, it } from 'vitest'
 import { ITEM_TYPES, ItemService } from '../../../../src/dataservices/item.service'
+import { API_ROUTES } from '../../../../src/types/ApiRoutes.ts'
 
 describe('item.service.ts', () => {
 	'use strict'
@@ -28,7 +29,7 @@ describe('item.service.ts', () => {
 		it('should call GET with offset set to start param and STARRED item type', async () => {
 			axios.get.mockResolvedValue({ data: { feeds: [] } })
 
-			await ItemService.fetchStarred(0)
+			await ItemService.fetchStarred(0, 0)
 
 			expect(axios.get).toBeCalled()
 			const queryParams = axios.get.mock.calls[0][1].params
@@ -36,6 +37,30 @@ describe('item.service.ts', () => {
 			expect(queryParams.offset).toEqual(0)
 			expect(queryParams.type).toEqual(ITEM_TYPES.STARRED)
 		})
+
+		it('should return set feed by fetchKey', async () => {
+			const feedId = 5
+			await ItemService.fetchStarred(feedId, 0)
+
+			expect(axios.get).toHaveBeenCalled()
+			const calls = (axios.get as any).mock.calls
+			const [url, config] = calls[calls.length - 1] // use last call
+			expect(url).toBe(API_ROUTES.ITEMS)
+			expect(config).toHaveProperty('params')
+			expect(config.params).toHaveProperty('id', feedId)
+		})
+
+		it('should return non feed by fetchKey without id', async () => {
+			const feedId = 0
+			await ItemService.fetchStarred(feedId, 0)
+
+			expect(axios.get).toHaveBeenCalled()
+			const calls = (axios.get as any).mock.calls
+			const [url, config] = calls[calls.length - 1] // use last call
+			expect(url).toBe(API_ROUTES.ITEMS)
+			expect(config).toHaveProperty('params')
+			expect(config.params.id).toBeUndefined()
+		})
 	})
 
 	describe('fetchUnread', () => {
diff --git a/tests/javascript/unit/store/feed.spec.ts b/tests/javascript/unit/store/feed.spec.ts
index 471ef339ba..9f35366329 100644
--- a/tests/javascript/unit/store/feed.spec.ts
+++ b/tests/javascript/unit/store/feed.spec.ts
@@ -264,5 +264,29 @@ describe('feed.ts', () => {
 				expect(state.feeds.length).toEqual(0)
 			})
 		})
+
+		describe('MODIFY_STARRED_COUNT', () => {
+			it('should increments starredCount when adding starred items', () => {
+				const state: any = { feeds: [{ id: 1, starredCount: 0 }], unreadCount: 0, newestItemId: 0, ordering: {} }
+
+				mutations[FEED_MUTATION_TYPES.MODIFY_STARRED_COUNT](state, { feedId: 1, add: true })
+				expect(state.feeds[0].starredCount).toBe(1)
+			})
+
+			it('should decrement starredCount when removing starring', () => {
+				const state: any = { feeds: [{ id: 2, starredCount: 2 }], unreadCount: 0, newestItemId: 0, ordering: {} }
+
+				mutations[FEED_MUTATION_TYPES.MODIFY_STARRED_COUNT](state, { feedId: 2, add: false })
+				expect(state.feeds[0].starredCount).toBe(1)
+			})
+
+			it('should do nothing if no feed is found', () => {
+				const state: any = { feeds: [{ id: 3, starredCount: 5 }], unreadCount: 0, newestItemId: 0, ordering: {} }
+
+				// call with non-existing feedId
+				mutations[FEED_MUTATION_TYPES.MODIFY_STARRED_COUNT](state, { feedId: 999, add: true })
+				expect(state.feeds[0].starredCount).toBe(5)
+			})
+		})
 	})
 })
diff --git a/tests/javascript/unit/store/item.spec.ts b/tests/javascript/unit/store/item.spec.ts
index b1496faded..dd0b44b9e8 100644
--- a/tests/javascript/unit/store/item.spec.ts
+++ b/tests/javascript/unit/store/item.spec.ts
@@ -50,6 +50,76 @@ describe('item.ts', () => {
 				expect(commit).toBeCalledWith(FEED_ITEM_MUTATION_TYPES.SET_ITEMS, [{ id: 123 }])
 				expect(commit).toBeCalledWith(FEED_ITEM_MUTATION_TYPES.SET_STARRED_COUNT, 3)
 			})
+
+			it('commits items, starred count, all loaded true and last item when items.length < 40 and starred present', async () => {
+				const feedId = 42
+				const items = [{ id: 1 }, { id: 2 }]
+				// mock response with starred count and newestItemId
+				vi.spyOn(ItemService, 'fetchStarred').mockResolvedValue({
+					data: {
+						items,
+						starred: 5,
+						newestItemId: 999,
+					},
+				} as any)
+
+				const commit = vi.fn()
+
+				await actions[FEED_ITEM_ACTION_TYPES.FETCH_STARRED]({ commit } as any, { feedId, start: 0 } as any)
+
+				// first commit: set fetching true
+				expect(commit.mock.calls[0][0]).toBe(FEED_ITEM_MUTATION_TYPES.SET_FETCHING)
+				expect(commit.mock.calls[0][1]).toEqual({ key: 'starred-' + feedId, fetching: true })
+
+				// SET_ITEMS
+				expect(commit).toHaveBeenCalledWith(FEED_ITEM_MUTATION_TYPES.SET_ITEMS, items)
+
+				// SET_STARRED_COUNT should be called with the starred value
+				expect(commit).toHaveBeenCalledWith(FEED_ITEM_MUTATION_TYPES.SET_STARRED_COUNT, 5)
+
+				// items.length < 40 -> SET_ALL_LOADED true
+				expect(commit).toHaveBeenCalledWith(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'starred-' + feedId, loaded: true })
+
+				// last item set to last item's id
+				expect(commit).toHaveBeenCalledWith(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'starred-' + feedId, lastItem: 2 })
+
+				// final commit: set fetching false
+				expect(commit.mock.calls[commit.mock.calls.length - 1][0]).toBe(FEED_ITEM_MUTATION_TYPES.SET_FETCHING)
+				expect(commit.mock.calls[commit.mock.calls.length - 1][1]).toEqual({ key: 'starred-' + feedId, fetching: false })
+
+				vi.restoreAllMocks()
+			})
+
+			it('commits all loaded false when items.length >= 40 and does not call SET_STARRED_COUNT if missing', async () => {
+				const feedId = 7
+				// create 40 items
+				const items = Array.from({ length: 40 }, (_, i) => ({ id: i + 1 }))
+				vi.spyOn(ItemService, 'fetchStarred').mockResolvedValue({
+					data: {
+						items,
+						// no 'starred' property in this response
+					},
+				} as any)
+
+				const commit = vi.fn()
+
+				await actions[FEED_ITEM_ACTION_TYPES.FETCH_STARRED]({ commit } as any, { feedId, start: 0 } as any)
+
+				// SET_ITEMS called
+				expect(commit).toHaveBeenCalledWith(FEED_ITEM_MUTATION_TYPES.SET_ITEMS, items)
+
+				// SET_STARRED_COUNT should NOT be called
+				const calledStarred = commit.mock.calls.some((c) => c[0] === FEED_ITEM_MUTATION_TYPES.SET_STARRED_COUNT)
+				expect(calledStarred).toBe(false)
+
+				// items.length >= 40 -> SET_ALL_LOADED false
+				expect(commit).toHaveBeenCalledWith(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'starred-' + feedId, loaded: false })
+
+				// lastItem should be the 40th id
+				expect(commit).toHaveBeenCalledWith(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'starred-' + feedId, lastItem: 40 })
+
+				vi.restoreAllMocks()
+			})
 		})
 
 		describe('FETCH_FEED_ITEMS', () => {