diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 01e6a5899..c357f7949 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -49,11 +49,11 @@
 				:force-menu="true">
 				<NcAppNavigationItem v-for="group in GroupedStars"
 					:key="group.id"
-					:ref="'starredfeed-' + group.id"
+					:ref="'starred-' + group.id"
 					:name="group.title"
 					:icon="''"
 					:exact="true"
-					:to="{ name: ROUTES.STARREDFEED, params: { feedId: group.id.toString() } }">
+					:to="{ name: ROUTES.STARRED, params: { feedId: group.id.toString() } }">
 					<template #icon>
 						<RssIcon v-if="!group.faviconLink" />
 						<span v-if="group.faviconLink" style="width: 16px; height: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + group.faviconLink + ')' }" />
diff --git a/src/components/routes/Starred.vue b/src/components/routes/Starred.vue
index 43c4d3710..cd28afa67 100644
--- a/src/components/routes/Starred.vue
+++ b/src/components/routes/Starred.vue
@@ -1,6 +1,6 @@
 <template>
 	<ContentTemplate :items="starred"
-		:fetch-key="feedId ? 'starredfeed-'+feedId : 'starred'"
+		:fetch-key="'starred-' + feedId"
 		@load-more="fetchMore()">
 		<template #header>
 			{{ t('news', 'Starred') }}
@@ -29,22 +29,25 @@ export default Vue.extend({
 		feedId: {
 			type: String,
 			required: false,
-			default: undefined,
+			default: '0',
 		},
 	},
 	computed: {
 		...mapState(['items']),
 		starred(): FeedItem[] {
-			if (this.feedId) {
-				return this.$store.getters.starred.filter((item: FeedItem) => item.feedId === Number(this.feedId))
+			if (this.id > 0) {
+				return this.$store.getters.starred.filter((item: FeedItem) => item.feedId === this.id)
 			}
 			return this.$store.getters.starred
 		},
+		id(): number {
+			return Number(this.feedId)
+		},
 	},
 	methods: {
 		async fetchMore() {
-			if (!this.$store.state.items.fetchingItems.starred) {
-			  this.$store.dispatch(ACTIONS.FETCH_STARRED, { feedId: this.feedId === undefined ? 0 : Number(this.feedId) })
+			if (!this.$store.state.items.fetchingItems['starred-' + this.feedId]) {
+				this.$store.dispatch(ACTIONS.FETCH_STARRED, { feedId: this.id })
 			}
 		},
 	},
diff --git a/src/routes/index.ts b/src/routes/index.ts
index 27564b40a..921a7e87a 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -12,7 +12,6 @@ import store from './../store/app'
 export const ROUTES = {
 	EXPLORE: 'explore',
 	STARRED: 'starred',
-	STARREDFEED: 'starredfeed',
 	UNREAD: 'unread',
 	FEED: 'feed',
 	FOLDER: 'folder',
@@ -36,16 +35,7 @@ const getInitialRoute = function() {
 			params,
 		}
 	case '2':
-		if (store.state.lastViewedFeedId) {
-			params.feedId = store.state.lastViewedFeedId
-			return {
-				name: ROUTES.STARREDFEED,
-				params,
-			}
-		}
-		return {
-			name: ROUTES.STARRED,
-		}
+		return { name: ROUTES.STARRED }
 	case '3':
 		return { name: ROUTES.ALL }
 	case '5':
@@ -71,20 +61,9 @@ const routes = [
 	},
 	{
 		name: ROUTES.STARRED,
-		path: '/starred',
+		path: '/starred/:feedId?',
 		component: StarredPanel,
-		redirect: { name: 'starredItems' },
 		props: true,
-		children: [
-			{
-				name: 'starredItems',
-				path: '',
-			},
-			{
-				name: ROUTES.STARREDFEED,
-				path: ':feedId',
-			},
-		],
 	},
 	{
 		name: ROUTES.UNREAD,
diff --git a/src/store/item.ts b/src/store/item.ts
index 97aa227d6..06c524a09 100644
--- a/src/store/item.ts
+++ b/src/store/item.ts
@@ -151,13 +151,9 @@ export const actions = {
 		{ commit }: ActionParams<ItemState>,
 		{ feedId, start }: { feedId: number, start: number } = { feedId: 0, start: 0 },
 	) {
-		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: feedId ? 'starredfeed-' + feedId : 'starred', fetching: true })
+		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'starred-' + feedId, fetching: true })
 
-		const lastLoadedStarred = feedId
-			? state.lastItemLoaded['starredfeed-' + feedId]
-			: state.lastItemLoaded.starred
-		const offset = start || lastLoadedStarred
-		const response = await ItemService.debounceFetchStarred(feedId, offset)
+		const response = await ItemService.debounceFetchStarred(feedId, start || state.lastItemLoaded['starred-' + feedId])
 		if (response?.data.newestItemId && response?.data.newestItemId !== state.newestItemId) {
 			state.syncNeeded = true
 		}
@@ -168,15 +164,15 @@ export const actions = {
 		}
 
 		if (response?.data.items.length < 40) {
-			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: feedId ? 'starredfeed-' + feedId : '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: feedId ? 'starredfeed-' + feedId : '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: feedId ? 'starredfeed-' + feedId : 'starred', lastItem })
+			commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'starred-' + feedId, lastItem })
 		}
-		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: feedId ? 'starredfeed-' + feedId : 'starred', fetching: false })
+		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'starred-' + feedId, fetching: false })
 	},
 
 	/**
diff --git a/tests/javascript/unit/components/routes/Starred.spec.ts b/tests/javascript/unit/components/routes/Starred.spec.ts
index b5a87251d..8f75ec090 100644
--- a/tests/javascript/unit/components/routes/Starred.spec.ts
+++ b/tests/javascript/unit/components/routes/Starred.spec.ts
@@ -24,7 +24,7 @@ describe('Starred.vue', () => {
 			state: {
 				items: {
 					fetchingItems: {
-						starred: false,
+						'starred-0': false,
 					},
 				},
 			},