diff --git a/src/App.vue b/src/App.vue
index 9f01915ee..05c257e0e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -68,6 +68,8 @@ export default Vue.extend({
 		// fetch folders and feeds to build side bar
 		await this.$store.dispatch(ACTIONS.FETCH_FOLDERS)
 		await this.$store.dispatch(ACTIONS.FETCH_FEEDS)
+
+		this.$store.commit(MUTATIONS.SET_LOADING, { value: false })
 	},
 	methods: {
 		stopPlaying() {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index b6fd72522..12b18c13b 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -48,60 +48,64 @@
 				</template>
 			</NcAppNavigationItem>
 
-			<NcAppNavigationItem v-for="topLevelItem in topLevelNav"
-				:key="topLevelItem.name || topLevelItem.title"
-				:name="topLevelItem.name || topLevelItem.title"
-				:icon="''"
-				:to="isFolder(topLevelItem) ? { name: ROUTES.FOLDER, params: { folderId: topLevelItem.id.toString() }} : { name: ROUTES.FEED, params: { feedId: topLevelItem.id.toString() } }"
-				:allow-collapse="true"
-				:force-menu="true">
-				<template #default>
-					<NcAppNavigationItem v-for="feed in topLevelItem.feeds"
-						:key="feed.name"
-						:name="feed.title"
-						:icon="''"
-						:to="{ name: ROUTES.FEED, params: { feedId: feed.id.toString() } }">
-						<template #icon>
-							<RssIcon v-if="!feed.faviconLink" />
-							<span v-if="feed.faviconLink" style="width: 16px; height: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + feed.faviconLink + ')' }" />
-						</template>
-						<template #counter>
-							<NcCounterBubble v-if="feed.unreadCount > 0">
-								{{ feed.unreadCount }}
-							</NcCounterBubble>
-						</template>
+			<template v-if="loading">
+				<NcAppNavigationItem name="Loading Feeds" :loading="true" />
+			</template>
+			<template v-else>
+				<NcAppNavigationItem v-for="topLevelItem in topLevelNav"
+					:key="topLevelItem.name || topLevelItem.title"
+					:name="topLevelItem.name || topLevelItem.title"
+					:icon="''"
+					:to="isFolder(topLevelItem) ? { name: ROUTES.FOLDER, params: { folderId: topLevelItem.id.toString() }} : { name: ROUTES.FEED, params: { feedId: topLevelItem.id.toString() } }"
+					:allow-collapse="true"
+					:force-menu="true">
+					<template v-for="feed in topLevelItem.feeds">
+						<NcAppNavigationItem :key="feed.name"
+							:name="feed.title"
+							:icon="''"
+							:to="{ name: ROUTES.FEED, params: { feedId: feed.id.toString() } }">
+							<template #icon>
+								<RssIcon v-if="!feed.faviconLink" />
+								<span v-if="feed.faviconLink" style="width: 16px; height: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + feed.faviconLink + ')' }" />
+							</template>
+							<template #counter>
+								<NcCounterBubble v-if="feed.unreadCount > 0">
+									{{ feed.unreadCount }}
+								</NcCounterBubble>
+							</template>
 
-						<template #actions>
-							<SidebarFeedLinkActions :feed-id="feed.id" />
-						</template>
-					</NcAppNavigationItem>
-				</template>
-				<template #icon>
-					<FolderIcon v-if="topLevelItem.feedCount !== undefined" style="width:22px" />
-					<RssIcon v-if="topLevelItem.feedCount === undefined && !topLevelItem.faviconLink" />
-					<span v-if="topLevelItem.feedCount === undefined && topLevelItem.faviconLink" style="height: 16px; width: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + topLevelItem.faviconLink + ')' }" />
-				</template>
-				<template #counter>
-					<NcCounterBubble v-if="topLevelItem.feedCount > 0">
-						{{ topLevelItem.feedCount }}
-					</NcCounterBubble>
-					<NcCounterBubble v-if="topLevelItem.unreadCount > 0">
-						{{ topLevelItem.unreadCount }}
-					</NcCounterBubble>
-				</template>
-				<template #actions>
-					<SidebarFeedLinkActions v-if="topLevelItem.name === undefined && !topLevelItem.url.includes('news/sharedwithme')" :feed-id="topLevelItem.id" />
-					<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-checkmark" @click="markFolderRead(topLevelItem)">
-						{{ t("news", "Mark read") }}
-					</NcActionButton>
-					<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-rename" @click="renameFolder(topLevelItem)">
-						{{ t("news", "Rename") }}
-					</NcActionButton>
-					<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-delete" @click="deleteFolder(topLevelItem)">
-						{{ t("news", "Delete") }}
-					</NcActionButton>
-				</template>
-			</NcAppNavigationItem>
+							<template #actions>
+								<SidebarFeedLinkActions :feed-id="feed.id" />
+							</template>
+						</NcAppNavigationItem>
+					</template>
+					<template #icon>
+						<FolderIcon v-if="topLevelItem.feedCount !== undefined" style="width:22px" />
+						<RssIcon v-if="topLevelItem.feedCount === undefined && !topLevelItem.faviconLink" />
+						<span v-if="topLevelItem.feedCount === undefined && topLevelItem.faviconLink" style="height: 16px; width: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + topLevelItem.faviconLink + ')' }" />
+					</template>
+					<template #counter>
+						<NcCounterBubble v-if="topLevelItem.feedCount > 0">
+							{{ topLevelItem.feedCount }}
+						</NcCounterBubble>
+						<NcCounterBubble v-if="topLevelItem.unreadCount > 0">
+							{{ topLevelItem.unreadCount }}
+						</NcCounterBubble>
+					</template>
+					<template #actions>
+						<SidebarFeedLinkActions v-if="topLevelItem.name === undefined && !topLevelItem.url.includes('news/sharedwithme')" :feed-id="topLevelItem.id" />
+						<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-checkmark" @click="markFolderRead(topLevelItem)">
+							{{ t("news", "Mark read") }}
+						</NcActionButton>
+						<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-rename" @click="renameFolder(topLevelItem)">
+							{{ t("news", "Rename") }}
+						</NcActionButton>
+						<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-delete" @click="deleteFolder(topLevelItem)">
+							{{ t("news", "Delete") }}
+						</NcActionButton>
+					</template>
+				</NcAppNavigationItem>
+			</template>
 
 			<NcAppNavigationItem :name="t('news', 'Explore')"
 				icon="true"
@@ -239,6 +243,11 @@ export default Vue.extend({
 	computed: {
 		...mapState(['feeds', 'folders', 'items']),
 		...mapState(SideBarState),
+		loading: {
+			get() {
+				return this.$store.getters.loading
+			},
+		},
 		compact: {
 			get() {
 				return this.$store.getters.compact
@@ -373,7 +382,6 @@ export default Vue.extend({
 		isFolder(item: Feed | Folder) {
 			return (item as Folder).name !== undefined
 		},
-
 	},
 })
 
diff --git a/src/store/app.ts b/src/store/app.ts
index b56bf4365..4cb7c91b7 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -7,6 +7,7 @@ export const APPLICATION_ACTION_TYPES = {
 
 export type AppInfoState = {
 	error?: Error;
+	loading: boolean;
 	compact: boolean;
 	compactExpand: boolean;
 	oldestFirst: boolean;
@@ -18,6 +19,7 @@ export type AppInfoState = {
 
 const state: AppInfoState = {
 	error: undefined,
+	loading: true,
 	compact: loadState('news', 'compact', null) === '1',
 	compactExpand: loadState('news', 'compactExpand', null) === '1',
 	oldestFirst: loadState('news', 'oldestFirst', null) === '1',
@@ -31,6 +33,9 @@ const getters = {
 	error(state: AppInfoState) {
 		return state.error
 	},
+	loading() {
+		return state.loading
+	},
 	compact() {
 		return state.compact
 	},
@@ -67,6 +72,12 @@ export const mutations = {
 	) {
 		state.error = error
 	},
+	[APPLICATION_MUTATION_TYPES.SET_LOADING](
+		state: AppInfoState,
+		{ value }: { value: boolean },
+	) {
+		state.loading = value
+	},
 	compact(
 		state: AppInfoState,
 		{ value }: { value: boolean },
diff --git a/src/types/MutationTypes.ts b/src/types/MutationTypes.ts
index b6b5d7097..323a0a7a7 100644
--- a/src/types/MutationTypes.ts
+++ b/src/types/MutationTypes.ts
@@ -36,4 +36,5 @@ export const FEED_ITEM_MUTATION_TYPES = {
 
 export const APPLICATION_MUTATION_TYPES = {
 	SET_ERROR: 'SET_ERROR',
+	SET_LOADING: 'SET_LOADING',
 }