diff --git a/src/CollectivesApp.vue b/src/CollectivesApp.vue
index fbb644143..3baa8f6ec 100644
--- a/src/CollectivesApp.vue
+++ b/src/CollectivesApp.vue
@@ -87,7 +87,7 @@ export default {
 				this.rootStore.pageParam = val.params.page
 				this.rootStore.pageId = val.params.pageId ? parseInt(val.params.pageId) : null
 				this.rootStore.shareTokenParam = val.params.token
-				this.rootStore.fileIdQuery = val.query.fileId
+				this.rootStore.fileIdQuery = val.query.fileId ? parseInt(val.query.fileId) : ''
 			},
 
 			immediate: true,
diff --git a/src/components/CollectiveContainer.vue b/src/components/CollectiveContainer.vue
index e426f2164..d466c0184 100644
--- a/src/components/CollectiveContainer.vue
+++ b/src/components/CollectiveContainer.vue
@@ -90,11 +90,10 @@ export default {
 		]),
 
 		...mapState(usePagesStore, [
-			'currentFileIdPage',
 			'currentPage',
+			'currentPageId',
 			'currentPagePath',
 			'isLandingPage',
-			'pagePath',
 			'pagesLoaded',
 		]),
 
@@ -120,17 +119,11 @@ export default {
 			}
 		},
 
-		'currentPage.id': function() {
+		currentPageId: function() {
 			this.selectVersion(null)
 			this.slugUrl()
 		},
 
-		notFound: function(current) {
-			if (current && this.currentFileIdPage) {
-				this.$router.replace(this.pagePath(this.currentFileIdPage) + document.location.hash)
-			}
-		},
-
 		networkOnline: function(val) {
 			if (val && this.loadPending) {
 				this.getShares()
diff --git a/src/components/CollectivePrint.vue b/src/components/CollectivePrint.vue
index b3f01c3b4..bafd02001 100644
--- a/src/components/CollectivePrint.vue
+++ b/src/components/CollectivePrint.vue
@@ -119,7 +119,7 @@ export default {
 	},
 
 	async mounted() {
-		await this.getPages()
+		await this.getCurrentPages()
 			.catch(displayError('Could not fetch pages'))
 		this.loadPages.total = this.pagesTreeWalk().length
 	},
@@ -127,7 +127,7 @@ export default {
 	methods: {
 		t,
 
-		...mapActions(usePagesStore, ['getPages']),
+		...mapActions(usePagesStore, ['getCurrentPages']),
 
 		ready(pageId) {
 			if (this.waitingFor.indexOf(pageId) >= 0) {
diff --git a/src/components/Page/LandingPageWidgets.vue b/src/components/Page/LandingPageWidgets.vue
index 6abc4afb3..e1309a1be 100644
--- a/src/components/Page/LandingPageWidgets.vue
+++ b/src/components/Page/LandingPageWidgets.vue
@@ -36,10 +36,10 @@ export default {
 
 	computed: {
 		...mapState(useRootStore, ['isPublic']),
-		...mapState(usePagesStore, ['pages']),
+		...mapState(usePagesStore, ['currentPages']),
 
 		showRecentPages() {
-			return this.pages.length > 3
+			return this.currentPages.length > 3
 		},
 	},
 }
diff --git a/src/components/Page/PageActionMenu.vue b/src/components/Page/PageActionMenu.vue
index aa7a70c0a..7506799c3 100644
--- a/src/components/Page/PageActionMenu.vue
+++ b/src/components/Page/PageActionMenu.vue
@@ -47,7 +47,7 @@
 				</NcActionCheckbox>
 				<NcActionButton
 					closeAfterClick
-					@click="toggleOutline(currentPage.id)">
+					@click="toggleOutline(currentPageId)">
 					<template #icon>
 						<FormatListBulletedIcon :size="20" />
 					</template>
@@ -118,9 +118,9 @@
 
 			<!-- Download action: always displayed -->
 			<NcActionLink
-				:href="pageDavUrl(pageById(pageId))"
+				:href="davUrl"
 				:class="{ 'action-link--disabled': !networkOnline }"
-				:download="pageById(pageId).fileName"
+				:download="fileName"
 				closeAfterClick>
 				<template #icon>
 					<DownloadIcon :size="20" />
@@ -231,6 +231,16 @@ export default {
 			required: true,
 		},
 
+		fileName: {
+			type: String,
+			required: true,
+		},
+
+		davUrl: {
+			type: String,
+			required: true,
+		},
+
 		lastUserDisplayName: {
 			type: String,
 			default: null,
@@ -282,8 +292,6 @@ export default {
 		...mapState(usePagesStore, [
 			'hasOutline',
 			'hasSubpages',
-			'pageById',
-			'pageDavUrl',
 		]),
 
 		displaySidebarAction() {
@@ -301,7 +309,7 @@ export default {
 		},
 
 		toggleOutlineString() {
-			return this.hasOutline(this.currentPage.id)
+			return this.hasOutline(this.currentPageId)
 				? t('collectives', 'Hide outline')
 				: t('collectives', 'Show outline')
 		},
@@ -342,15 +350,15 @@ export default {
 		]),
 
 		onCheckFullWidthView() {
-			this.setFullWidthView({ pageId: this.currentPage.id, fullWidthView: true })
+			this.setFullWidthView({ pageId: this.currentPageId, fullWidthView: true })
 		},
 
 		onUncheckFullWidthView() {
-			this.setFullWidthView({ pageId: this.currentPage.id, fullWidthView: false })
+			this.setFullWidthView({ pageId: this.currentPageId, fullWidthView: false })
 		},
 
 		async openShareTab() {
-			if (this.pageUrl && (this.currentPage.id !== this.pageId)) {
+			if (this.pageUrl && (this.currentPageId !== this.pageId)) {
 				await this.$router.push(this.pageUrl)
 			}
 			this.show('details')
@@ -359,7 +367,7 @@ export default {
 		},
 
 		async gotoPageEmojiPicker() {
-			if (this.pageUrl && (this.currentPage.id !== this.pageId)) {
+			if (this.pageUrl && (this.currentPageId !== this.pageId)) {
 				await this.$router.push(this.pageUrl)
 			}
 			this.show('details')
diff --git a/src/components/Page/PagePicker.vue b/src/components/Page/PagePicker.vue
index f57317336..394a104b3 100644
--- a/src/components/Page/PagePicker.vue
+++ b/src/components/Page/PagePicker.vue
@@ -218,11 +218,10 @@ export default {
 		...mapState(usePagesStore, [
 			'rootPage',
 			'pageById',
+			'currentPageParents',
 			'pageParents',
-			'pageParentsForCollective',
-			'pagesForCollective',
-			'sortedSubpagesForCollective',
-			'visibleSubpages',
+			'pages',
+			'sortedSubpagesByParentId',
 		]),
 
 		isActionButtonsDisabled() {
@@ -240,7 +239,7 @@ export default {
 
 			return this.isCurrentCollective
 				? this.rootPage
-				: this.pagesForCollective(this.selectedCollective).find((p) => (p.parentId === 0))
+				: this.pages(this.selectedCollective).find((p) => (p.parentId === 0))
 		},
 
 		subpages() {
@@ -251,9 +250,9 @@ export default {
 
 			let pages
 			if (this.isCurrentCollective) {
-				pages = this.visibleSubpages(this.selectedPageId)
+				pages = this.currentSortedSubpagesByParentId.get(this.selectedPageId) || []
 			} else {
-				pages = this.sortedSubpagesForCollective(this.selectedCollective, this.selectedPageId)
+				pages = this.sortedSubpagesByParentId(this.selectedCollective).get(this.selectedPageId)
 			}
 
 			// Add current page to top of subpages if not part of it yet
@@ -266,8 +265,8 @@ export default {
 
 		pageCrumbs() {
 			return this.isCurrentCollective
-				? this.pageParents(this.selectedPageId)
-				: this.pageParentsForCollective(this.selectedCollective, this.selectedPageId)
+				? this.currentPageParents(this.selectedPageId)
+				: this.pageParents(this.selectedCollective, this.selectedPageId)
 		},
 
 		collectivesCrumbString() {
@@ -330,7 +329,7 @@ export default {
 	methods: {
 		t,
 
-		...mapActions(usePagesStore, ['getPagesForCollective']),
+		...mapActions(usePagesStore, ['getPages']),
 
 		scrollToPage() {
 			// Scroll current page into view (important when listing parent page)
@@ -377,7 +376,7 @@ export default {
 		async onClickCollective(collective) {
 			this.selectedCollective = collective
 			if (!this.isCurrentCollective) {
-				await this.getPagesForCollective(this.selectedCollective)
+				await this.getPages(this.selectedCollective)
 			}
 			this.selectedPageId = this.selectedRootPage.id
 			// Reset reordered pages when changing collective
diff --git a/src/components/Page/PageTitleBar.vue b/src/components/Page/PageTitleBar.vue
index fa371b5fb..689f262bb 100644
--- a/src/components/Page/PageTitleBar.vue
+++ b/src/components/Page/PageTitleBar.vue
@@ -96,6 +96,8 @@
 				:pageId="currentPage.id"
 				:parentId="currentPage.parentId"
 				:timestamp="currentPage.timestamp"
+				:fileName="currentPage.fileName"
+				:davUrl="pageDavUrl(currentPage)"
 				:lastUserId="currentPage.lastUserId"
 				:lastUserDisplayName="currentPage.lastUserDisplayName"
 				:isLandingPage
@@ -176,10 +178,12 @@ export default {
 
 		...mapState(usePagesStore, [
 			'currentPage',
+			'currentPageId',
 			'currentPagePath',
 			'isIndexPage',
 			'isLandingPage',
 			'isTextEdit',
+			'pageDavUrl',
 		]),
 
 		titleChanged() {
@@ -204,7 +208,7 @@ export default {
 		},
 
 		emojiButtonIsLoading() {
-			return this.loading(`pageEmoji-${this.currentPage.id}`)
+			return this.loading(`pageEmoji-${this.currentPageId}`)
 		},
 
 		pageTitleIconSize() {
@@ -217,7 +221,7 @@ export default {
 			document.title = this.documentTitle
 		},
 
-		'currentPage.id': function() {
+		currentPageId: function() {
 			this.initTitleEntry()
 		},
 	},
@@ -239,7 +243,7 @@ export default {
 		...mapActions(useRootStore, ['done']),
 
 		...mapActions(usePagesStore, [
-			'getPages',
+			'getCurrentPages',
 			'renamePage',
 		]),
 
@@ -259,7 +263,7 @@ export default {
 		},
 
 		async onSelectEmoji(emoji) {
-			await this.setEmoji(this.currentPage.id, emoji)
+			await this.setEmoji(this.currentPageId, emoji)
 		},
 
 		onUnselectEmoji() {
@@ -281,7 +285,7 @@ export default {
 				await this.renamePage(this.newTitle)
 				// The resulting title may be different due to sanitizing
 				this.newTitle = this.currentPage.title
-				this.getPages(false)
+				this.getCurrentPages(false)
 				await this.$router.replace(this.currentPagePath)
 			} catch (e) {
 				console.error(e)
diff --git a/src/components/Page/TagsModal.vue b/src/components/Page/TagsModal.vue
index e52577313..32a54a8a3 100644
--- a/src/components/Page/TagsModal.vue
+++ b/src/components/Page/TagsModal.vue
@@ -192,11 +192,11 @@ export default {
 
 	computed: {
 		...mapState(useRootStore, ['loading']),
-		...mapState(usePagesStore, ['pages']),
+		...mapState(usePagesStore, ['currentPages', 'pageById']),
 		...mapState(useTagsStore, ['sortedTags']),
 
 		page() {
-			return this.pages.find((p) => p.id === this.pageId)
+			return this.pageById(this.pageId)
 		},
 
 		decoratedTags() {
@@ -214,7 +214,7 @@ export default {
 		},
 
 		countTagPages() {
-			return (tagId) => this.pages.filter((p) => p.tags.includes(tagId)).length
+			return (tagId) => this.currentPages.filter((p) => p.tags.includes(tagId)).length
 		},
 
 		showCreateTag() {
diff --git a/src/components/PageContainer.vue b/src/components/PageContainer.vue
index 5b1741984..9271e17e3 100644
--- a/src/components/PageContainer.vue
+++ b/src/components/PageContainer.vue
@@ -12,7 +12,7 @@
 		<PageTags v-if="tagsLoaded" :isFullWidth />
 		<div class="page-scroll-container">
 			<LandingPageWidgets v-if="isLandingPage" :isFullWidth />
-			<TextEditor :key="`text-editor-${currentPage.id}`" ref="texteditor" :isFullWidth />
+			<TextEditor :key="`text-editor-${currentPageId}`" ref="texteditor" :isFullWidth />
 		</div>
 		<SearchDialog :show="shouldShowSearchDialog" />
 	</div>
@@ -65,6 +65,7 @@ export default {
 		...mapState(useTagsStore, ['tagsLoaded']),
 		...mapState(usePagesStore, [
 			'currentPage',
+			'currentPageId',
 			'isLandingPage',
 		]),
 
@@ -78,7 +79,7 @@ export default {
 	},
 
 	watch: {
-		'currentPage.id': function() {
+		currentPageId: function() {
 			this.setAttachmentsError(false)
 			this.setAttachmentsLoaded(false)
 			this.getAttachmentsForPage(true)
diff --git a/src/components/PageList.vue b/src/components/PageList.vue
index d4643f441..14d6f84f5 100644
--- a/src/components/PageList.vue
+++ b/src/components/PageList.vue
@@ -118,6 +118,8 @@
 				:parentId="0"
 				:title="currentCollectiveIsPageShare ? rootPage.title : currentCollective.name"
 				:timestamp="rootPage.timestamp"
+				:fileName="rootPage.fileName"
+				:davUrl="pageDavUrl(rootPage)"
 				:lastUserId="rootPage.lastUserId"
 				:lastUserDisplayName="rootPage.lastUserDisplayName"
 				:emoji="currentCollectiveIsPageShare ? rootPage.emoji : currentCollective.emoji"
@@ -313,22 +315,17 @@ export default {
 		...mapState(useTagsStore, ['sortedTags', 'filterTags']),
 		...mapState(usePagesStore, [
 			'rootPage',
-			'currentPage',
+			'currentPageId',
 			'newPageParentId',
 			'hasFavoritePages',
-			'visibleSubpages',
 			'sortByOrder',
-			'allPagesSorted',
+			'allCurrentSortedPages',
+			'currentSortedSubpagesByParentId',
+			'pageDavUrl',
 		]),
 
-		allPagesSortedCached() {
-			return this.rootPage
-				? this.allPagesSorted(this.rootPage.id)
-				: []
-		},
-
 		filteredPages() {
-			return this.allPagesSortedCached
+			return this.allCurrentSortedPages
 				// Filter by page title search string
 				.filter((p) => p.title.toLowerCase().includes(this.filterString.toLowerCase()))
 				// Filter by page tags
@@ -363,7 +360,7 @@ export default {
 
 		subpages() {
 			if (this.rootPage) {
-				return this.visibleSubpages(this.rootPage.id)
+				return this.currentSortedSubpagesByParentId.get(this.rootPage.id)
 			} else {
 				return []
 			}
@@ -496,7 +493,7 @@ export default {
 					})
 			}
 			this.$nextTick(() => {
-				scrollToPage(this.currentPage.id)
+				scrollToPage(this.currentPageId)
 			})
 		},
 
diff --git a/src/components/PageList/PageFavorites.vue b/src/components/PageList/PageFavorites.vue
index e2a363567..16e036a26 100644
--- a/src/components/PageList/PageFavorites.vue
+++ b/src/components/PageList/PageFavorites.vue
@@ -33,6 +33,8 @@
 				:parentId="page.parentId"
 				:title="page.title"
 				:timestamp="page.timestamp"
+				:fileName="page.fileName"
+				:davUrl="pageDavUrl(page)"
 				:lastUserId="page.lastUserId"
 				:lastUserDisplayName="page.lastUserDisplayName"
 				:emoji="page.emoji"
@@ -86,6 +88,7 @@ export default {
 
 		...mapState(usePagesStore, [
 			'favoritePages',
+			'pageDavUrl',
 			'pagePath',
 		]),
 	},
diff --git a/src/components/PageList/PageListItem.vue b/src/components/PageList/PageListItem.vue
index 319515424..d93b6df71 100644
--- a/src/components/PageList/PageListItem.vue
+++ b/src/components/PageList/PageListItem.vue
@@ -78,6 +78,8 @@
 				:pageUrl="to"
 				:parentId
 				:timestamp
+				:fileName
+				:davUrl
 				:lastUserId
 				:lastUserDisplayName
 				:isLandingPage
@@ -162,6 +164,16 @@ export default {
 			required: true,
 		},
 
+		fileName: {
+			type: String,
+			required: true,
+		},
+
+		davUrl: {
+			type: String,
+			required: true,
+		},
+
 		lastUserId: {
 			type: String,
 			default: null,
@@ -247,7 +259,7 @@ export default {
 			'highlightPageId',
 			'isDragoverTargetPage',
 			'pageParent',
-			'pageParents',
+			'currentPageParents',
 		]),
 
 		...mapState(useTemplatesStore, ['hasTemplates']),
@@ -310,7 +322,7 @@ export default {
 				// Ignore if inside favorite list
 				&& !this.inFavoriteList
 				// Ignore if dragged element is a parent of self
-				&& !this.pageParents(this.pageId).includes(this.draggedPageId)
+				&& !this.currentPageParents(this.pageId).includes(this.draggedPageId)
 		},
 
 		isDropTarget() {
diff --git a/src/components/PageList/SubpageList.vue b/src/components/PageList/SubpageList.vue
index 21d58c0be..2393cdc57 100644
--- a/src/components/PageList/SubpageList.vue
+++ b/src/components/PageList/SubpageList.vue
@@ -12,6 +12,8 @@
 			:parentId="page.parentId"
 			:title="page.title"
 			:timestamp="page.timestamp"
+			:fileName="page.fileName"
+			:davUrl="pageDavUrl(page)"
 			:lastUserId="page.lastUserId"
 			:lastUserDisplayName="page.lastUserDisplayName"
 			:emoji="page.emoji"
@@ -84,9 +86,11 @@ export default {
 		...mapState(usePagesStore, [
 			'pagePath',
 			'currentPageIds',
+			'hasSubpages',
 			'keptSortable',
-			'visibleSubpages',
+			'currentSortedSubpagesByParentId',
 			'isCollapsed',
+			'pageDavUrl',
 		]),
 
 		showSubpages() {
@@ -96,13 +100,13 @@ export default {
 
 		subpagesView() {
 			if (this.showSubpages) {
-				return this.visibleSubpages(this.page.id)
+				return this.currentSortedSubpagesByParentId.get(this.page.id)
 			}
 			return []
 		},
 
 		hasVisibleSubpages() {
-			return !!this.visibleSubpages(this.page.id).length
+			return this.hasSubpages(this.page.id)
 		},
 
 		disableSorting() {
diff --git a/src/components/PageSidebar.vue b/src/components/PageSidebar.vue
index 69c4749b3..b1311fdba 100644
--- a/src/components/PageSidebar.vue
+++ b/src/components/PageSidebar.vue
@@ -39,7 +39,7 @@
 			<template #icon>
 				<ShareVariantIcon :size="20" />
 			</template>
-			<SidebarTabSharing v-if="showing('sidebar')" :pageId="currentPage.id" />
+			<SidebarTabSharing v-if="showing('sidebar')" :pageId="currentPageId" />
 		</NcAppSidebarTab>
 		<NcAppSidebarTab
 			v-if="!isPublic && currentCollectiveCanEdit"
@@ -51,7 +51,7 @@
 			</template>
 			<SidebarTabVersions
 				v-if="showing('sidebar')"
-				:pageId="currentPage.id"
+				:pageId="currentPageId"
 				:pageTimestamp="currentPage.timestamp" />
 		</NcAppSidebarTab>
 	</NcAppSidebar>
@@ -104,7 +104,7 @@ export default {
 			'currentCollectiveCanShare',
 		]),
 
-		...mapState(usePagesStore, ['currentPage', 'title']),
+		...mapState(usePagesStore, ['currentPage', 'currentPageId', 'title']),
 
 		active: {
 			get() {
diff --git a/src/components/PageVersion.vue b/src/components/PageVersion.vue
index 2d9273014..ffe4828c2 100644
--- a/src/components/PageVersion.vue
+++ b/src/components/PageVersion.vue
@@ -104,6 +104,7 @@ export default {
 		...mapState(useVersionsStore, ['selectedVersion']),
 		...mapState(usePagesStore, [
 			'currentPage',
+			'currentPageId',
 			'title',
 		]),
 
@@ -120,7 +121,7 @@ export default {
 		},
 
 		contentLoaded() {
-			return !!this.content || !this.loading(`version-${this.currentPage.id}-${this.selectedVersion.mtime}`)
+			return !!this.content || !this.loading(`version-${this.currentPageId}-${this.selectedVersion.mtime}`)
 		},
 	},
 
@@ -159,9 +160,9 @@ export default {
 		},
 
 		async getPageContent() {
-			this.load(`version-${this.currentPage.id}-${this.selectedVersion.mtime}`)
+			this.load(`version-${this.currentPageId}-${this.selectedVersion.mtime}`)
 			this.content = await this.fetchPageContent(this.selectedVersion.url)
-			this.done(`version-${this.currentPage.id}-${this.selectedVersion.mtime}`)
+			this.done(`version-${this.currentPageId}-${this.selectedVersion.mtime}`)
 		},
 	},
 }
diff --git a/src/mixins/pageMixin.js b/src/mixins/pageMixin.js
index f942e3ba8..049b5ac5d 100644
--- a/src/mixins/pageMixin.js
+++ b/src/mixins/pageMixin.js
@@ -21,13 +21,13 @@ export default {
 		]),
 		...mapState(usePagesStore, [
 			'currentPage',
+			'currentPageId',
 			'newPageId',
 			'newPagePath',
-			'pageById',
 			'pagePath',
 			'pageTitle',
 			'pages',
-			'sortedSubpages',
+			'currentSortedSubpagesByParentId',
 		]),
 	},
 
@@ -38,7 +38,7 @@ export default {
 			'addToSubpageOrder',
 			'deleteFromSubpageOrder',
 			'updateSubpageOrder',
-			'getPages',
+			'getCurrentPages',
 			'createPage',
 			'setPageEmoji',
 			'setPageSubpageOrder',
@@ -73,7 +73,7 @@ export default {
 			this.$nextTick(() => scrollToPage(this.newPageId))
 
 			// Parents location changes when the first subpage is created.
-			this.getPages(false)
+			this.getCurrentPages(false)
 		},
 
 		/**
@@ -121,13 +121,11 @@ export default {
 		 * @param {number} newIndex New index for pageId
 		 */
 		async move(oldParentId, newParentId, pageId, newIndex) {
-			const currentPageId = this.currentPage?.id
-
 			// Add page to subpageOrder of new parent first for instant UI feedback
 			this.addToSubpageOrder({ parentId: newParentId, pageId, newIndex })
 
 			// Move subpage to new parent
-			if (currentPageId === pageId) {
+			if (this.currentPageId === pageId) {
 				this.load('currentPage')
 			}
 			try {
@@ -141,8 +139,8 @@ export default {
 			}
 
 			// Redirect to new page path if currentPage got moved
-			if (currentPageId === pageId) {
-				this.$router.replace(this.pagePath(this.pageById(currentPageId)))
+			if (this.currentPageId === pageId) {
+				this.$router.replace(this.pagePath(this.currentPage))
 			}
 
 			// Remove page from subpageOrder of old parent last
@@ -185,7 +183,6 @@ export default {
 		 * @param {number} newIndex New index for pageId
 		 */
 		async moveToCollective(collectiveId, oldParentId, newParentId, pageId, newIndex) {
-			const currentPageId = this.currentPage?.id
 			const pageTitle = this.pageTitle(pageId)
 
 			// Move subpage to new collective
@@ -198,7 +195,7 @@ export default {
 			}
 
 			// Redirect to root page if currentPage got moved
-			if (currentPageId === pageId) {
+			if (this.currentPageId === pageId) {
 				this.$router.replace(this.currentCollectivePath)
 			}
 
@@ -215,8 +212,6 @@ export default {
 		 * @param {number} pageId ID of the page
 		 */
 		async deletePage(pageId) {
-			const currentPageId = this.currentPage?.id
-
 			try {
 				await this.trashPage({ pageId })
 			} catch (e) {
@@ -226,7 +221,7 @@ export default {
 			}
 
 			// Redirect to root page if currentPage got deleted
-			if (currentPageId === pageId) {
+			if (this.currentPageId === pageId) {
 				await this.$router.push(`/${encodeURIComponent(this.currentCollective.name)}`)
 			}
 
@@ -245,7 +240,7 @@ export default {
 		 * @param {number} newIndex New index for pageId
 		 */
 		async subpageOrderUpdate(parentId, pageId, newIndex) {
-			const subpageOrder = this.sortedSubpages(parentId)
+			const subpageOrder = this.currentSortedSubpagesByParentId.get(parentId)
 				.map((p) => p.id)
 			subpageOrder.splice(subpageOrder.findIndex((id) => id === pageId), 1)
 			subpageOrder.splice(newIndex, 0, pageId)
diff --git a/src/stores/pages.js b/src/stores/pages.js
index 29e5b34a4..db3a582c4 100644
--- a/src/stores/pages.js
+++ b/src/stores/pages.js
@@ -46,14 +46,14 @@ export const usePagesStore = defineStore('pages', {
 			return collectivesStore.currentCollective.id
 		},
 
-		collectiveIndex(state) {
+		currentCollectiveIndex(state) {
 			const rootStore = useRootStore()
 			return rootStore.isPublic
 				? `share_${rootStore.shareTokenParam}`
 				: state.collectiveId
 		},
 
-		indexForCollective() {
+		collectiveIndex() {
 			return (collective) => {
 				const rootStore = useRootStore()
 				return rootStore.isPublic
@@ -71,23 +71,23 @@ export const usePagesStore = defineStore('pages', {
 			}
 		},
 
-		pagesForCollective: (state) => {
-			return (collective) => state.allPages[state.indexForCollective(collective)] || []
+		pages: (state) => {
+			return (collective) => state.allPages[state.collectiveIndex(collective)] || []
 		},
 
-		pages: (state) => {
-			return state.allPages[state.collectiveIndex] || []
+		currentPages: (state) => {
+			return state.allPages[state.currentCollectiveIndex] || []
 		},
-		trashPages: (state) => {
-			return state.allTrashPages[state.collectiveIndex] || []
+		currentTrashPages: (state) => {
+			return state.allTrashPages[state.currentCollectiveIndex] || []
 		},
 
 		attachments: (state) => {
-			return state.allAttachments[state.collectiveIndex]?.[state.currentPageId] || []
+			return state.allAttachments[state.currentCollectiveIndex]?.[state.currentPageId] || []
 		},
 
 		pagesLoaded: (state) => {
-			return state.pages.length > 0
+			return state.currentPages.length > 0
 		},
 
 		isLandingPage: (state) => {
@@ -110,8 +110,8 @@ export const usePagesStore = defineStore('pages', {
 		rootPage(state) {
 			const collectivesStore = useCollectivesStore()
 			return collectivesStore.currentCollectiveIsPageShare
-				? state.pages[0]
-				: state.pages.find((p) => (p.parentId === 0))
+				? state.currentPages[0]
+				: state.currentPages.find((p) => (p.parentId === 0))
 		},
 
 		currentPageIds(state) {
@@ -123,10 +123,10 @@ export const usePagesStore = defineStore('pages', {
 			}
 
 			const pageIds = []
-			if (rootStore.pageId) {
-				let pageId = rootStore.pageId
+			let pageId = rootStore.pageId || rootStore.fileIdQuery
+			if (pageId) {
 				do {
-					const page = state.pageById(pageId)
+					const page = state.currentPages.find((p) => (p.id === pageId))
 					pageIds.unshift(page.id)
 					pageId = page.parentId
 				} while (pageId)
@@ -137,7 +137,7 @@ export const usePagesStore = defineStore('pages', {
 			const parts = rootStore.pageParam.split('/').filter(Boolean)
 			let page = state.rootPage
 			for (const i in parts) {
-				page = state.pages.find((p) => (p.parentId === page.id && p.title === parts[i]))
+				page = state.currentPages.find((p) => (p.parentId === page.id && p.title === parts[i]))
 				if (page) {
 					pageIds.push(page.id)
 				} else {
@@ -147,23 +147,20 @@ export const usePagesStore = defineStore('pages', {
 			return pageIds
 		},
 
-		currentPage(state) {
+		currentPageId(state) {
 			const rootStore = useRootStore()
-			if (rootStore.pageId) {
-				return state.pageById(rootStore.pageId)
-			} else if (rootStore.fileIdQuery) {
-				return state.pageById(Number(rootStore.fileIdQuery))
-			}
-			return state.pages.find((p) => (p.id === state.currentPageIds[state.currentPageIds.length - 1]))
+			return rootStore.pageId
+				|| rootStore.fileIdQuery
+				|| state.currentPageIds[state.currentPageIds.length - 1]
 		},
 
-		currentPageId(state) {
-			return state.currentPage.id
+		currentPage(state) {
+			return state.currentPages.find((p) => (p.id === state.currentPageId))
 		},
 
 		pageById(state) {
 			return (pageId) => {
-				return state.pages.find((p) => p.id === pageId)
+				return state.currentPages.find((p) => p.id === pageId)
 			}
 		},
 
@@ -242,67 +239,114 @@ export const usePagesStore = defineStore('pages', {
 				: generateRemoteUrl(`dav/files/${state.currentPageDavPath}`)
 		},
 
-		currentFileIdPage(state) {
-			const rootStore = useRootStore()
-			const fileId = Number(rootStore.fileIdQuery)
-			return state.pages.find((p) => (p.id === fileId))
-		},
-
 		hasSubpages(state) {
 			return (pageId) => {
-				return state.pages.filter((p) => p.parentId === pageId).length > 0
+				return state.currentPages.filter((p) => p.parentId === pageId).length > 0
 			}
 		},
 
 		favoritePages(state) {
 			const collectivesStore = useCollectivesStore()
 			const favoritePages = collectivesStore.currentCollective.userFavoritePages
-			return state.allPagesSorted(state.rootPage.id).filter((p) => favoritePages.includes(p.id))
+			return state.allCurrentSortedPages.filter((p) => favoritePages.includes(p.id))
 		},
 
 		hasFavoritePages(state) {
 			return state.favoritePages.length > 0
 		},
 
-		sortedSubpagesForCollective(state) {
-			return (collective, parentId, sortOrder = null) => {
-				const parentPage = state.pagesForCollective(collective).find((p) => p.id === parentId)
+		currentSortedSubpagesByParentId(state) {
+			// Group subpages by parentId
+			const subpagesByParent = new Map()
+			for (const page of state.currentPages) {
+				if (!subpagesByParent.has(page.parentId)) {
+					subpagesByParent.set(page.parentId, [])
+				}
+				subpagesByParent.get(page.parentId).push(page)
+			}
+
+			// Sort each group by subpageOrder
+			const sortedByParent = new Map()
+			for (const [parentId, subpages] of subpagesByParent) {
+				const parentPage = state.currentPages.find((p) => p.id === parentId)
 				const customOrder = parentPage?.subpageOrder || []
-				return state.pagesForCollective(collective)
-					.filter((p) => p.parentId === parentId)
+				const sorted = subpages
 					// add the index from customOrder
 					.map((p) => ({ ...p, index: customOrder.indexOf(p.id) }))
-					// sort by given order, fall back to user setting
-					.sort(sortOrders[sortOrder] || state.sortOrder)
+					// sort by user setting
+					.sort(state.sortOrder)
+				sortedByParent.set(parentId, sorted)
 			}
+			return sortedByParent
 		},
 
-		sortedSubpages(state) {
-			return (parentId, sortOrder) => {
-				const collectivesStore = useCollectivesStore()
-				return state.sortedSubpagesForCollective(collectivesStore.currentCollective, parentId, sortOrder)
+		allCurrentSortedPages(state) {
+			const result = []
+			const addPageWithSubpages = (pageId) => {
+				const subpages = state.currentSortedSubpagesByParentId.get(pageId) || []
+				for (const page of subpages) {
+					result.push(page)
+					addPageWithSubpages(page.id)
+				}
 			}
+			// Start from root page (parentId === 0)
+			addPageWithSubpages(0)
+			return result
 		},
 
-		allPagesSorted(state) {
-			const allSubPagesSorted = (pageId) => {
-				const res = []
-				state.sortedSubpages(pageId).forEach((element) => {
-					res.push(element)
-					res.push(...allSubPagesSorted(element.id))
-				})
-				return res
+		sortedSubpagesByParentId(state) {
+			return (collective) => {
+				// Group subpages by parentId
+				const subpagesByParent = new Map()
+				for (const page of state.pages(collective)) {
+					if (!subpagesByParent.has(page.parentId)) {
+						subpagesByParent.set(page.parentId, [])
+					}
+					subpagesByParent.get(page.parentId).push(page)
+				}
+
+				// Sort each group by subpageOrder
+				const sortedByParent = new Map()
+				for (const [parentId, subpages] of subpagesByParent) {
+					const parentPage = state.pages(collective).find((p) => p.id === parentId)
+					const customOrder = parentPage?.subpageOrder || []
+					const sorted = subpages
+						// add the index from customOrder
+						.map((p) => ({ ...p, index: customOrder.indexOf(p.id) }))
+						// sort by user setting
+						.sort(state.sortOrder)
+					sortedByParent.set(parentId, sorted)
+				}
+				return sortedByParent
 			}
-			return allSubPagesSorted
 		},
 
-		visibleSubpages: (state) => (parentId) => {
-			return state.sortedSubpages(parentId)
+		sortedSubpages(state) {
+			return (collective, parentId, sortOrder = null) => {
+				const parentPage = state.pages(collective).find((p) => p.id === parentId)
+				const customOrder = parentPage?.subpageOrder || []
+				return state.pages(collective)
+					.filter((p) => p.parentId === parentId)
+					// add the index from customOrder
+					.map((p) => ({ ...p, index: customOrder.indexOf(p.id) }))
+					// sort by given order, fall back to user setting
+					.sort(sortOrders[sortOrder] || state.sortOrder)
+			}
+		},
+
+		currentSortedSubpages(state) {
+			return (parentId, sortOrder) => {
+				if (sortOrder) {
+					const collectivesStore = useCollectivesStore()
+					return state.sortedSubpages(collectivesStore.currentCollective, parentId, sortOrder)
+				}
+				return state.currentSortedSubpagesByParentId.get(parentId) || []
+			}
 		},
 
 		pagesTreeWalk: (state) => (parentId = 0) => {
 			const pages = []
-			for (const page of state.visibleSubpages(parentId)) {
+			for (const page of state.currentSortedSubpagesByParentId.get(parentId)) {
 				pages.push(page)
 				for (const subpage of state.pagesTreeWalk(page.id)) {
 					pages.push(subpage)
@@ -312,14 +356,14 @@ export const usePagesStore = defineStore('pages', {
 		},
 
 		pageParent: (state) => (pageId) => {
-			return state.pages.find((p) => (p.id === pageId)).parentId
+			return state.currentPages.find((p) => (p.id === pageId)).parentId
 		},
 
-		pageParentsForCollective(state) {
+		pageParents(state) {
 			return (collective, pageId) => {
 				const pages = []
 				while (pageId !== state.rootPage.id) {
-					const page = state.pagesForCollective(collective).find((p) => (p.id === pageId))
+					const page = state.pages(collective).find((p) => (p.id === pageId))
 					if (!page) {
 						break
 					}
@@ -330,10 +374,10 @@ export const usePagesStore = defineStore('pages', {
 			}
 		},
 
-		pageParents(state) {
+		currentPageParents(state) {
 			return (pageId) => {
 				const collectivesStore = useCollectivesStore()
-				return state.pageParentsForCollective(collectivesStore.currentCollective, pageId)
+				return state.pageParents(collectivesStore.currentCollective, pageId)
 			}
 		},
 
@@ -373,7 +417,7 @@ export const usePagesStore = defineStore('pages', {
 		pageTitle(state) {
 			const rootStore = useRootStore()
 			return (pageId) => {
-				const page = state.pages.find((p) => p.id === pageId)
+				const page = state.currentPages.find((p) => p.id === pageId)
 				return (page.parentId === 0) ? rootStore.collectiveParam : page.title
 			}
 		},
@@ -393,11 +437,11 @@ export const usePagesStore = defineStore('pages', {
 		},
 
 		keptSortable(state) {
-			return (pageId) => state.pages.find((p) => p.id === pageId)?.keepSortable
+			return (pageId) => state.currentPages.find((p) => p.id === pageId)?.keepSortable
 		},
 
 		subpageOrder(state) {
-			return (pageId) => state.pages.find((p) => p.id === pageId).subpageOrder
+			return (pageId) => state.currentPages.find((p) => p.id === pageId).subpageOrder
 		},
 
 		subpageOrderIndex(state) {
@@ -408,11 +452,11 @@ export const usePagesStore = defineStore('pages', {
 		},
 
 		sortedTrashPages(state) {
-			return state.trashPages.sort((a, b) => b.trashTimestamp - a.trashTimestamp)
+			return state.currentTrashPages.sort((a, b) => b.trashTimestamp - a.trashTimestamp)
 		},
 
 		recentPages(state) {
-			return state.pages
+			return state.currentPages
 				.slice()
 				.sort(sortOrders.byTimeAsc)
 		},
@@ -429,7 +473,7 @@ export const usePagesStore = defineStore('pages', {
 
 		backlinks(state) {
 			return (pageId) => {
-				return state.pages.filter((p) => p.linkedPageIds.includes(pageId))
+				return state.currentPages.filter((p) => p.linkedPageIds.includes(pageId))
 			}
 		},
 
@@ -444,8 +488,8 @@ export const usePagesStore = defineStore('pages', {
 
 	actions: {
 		updateSubpageOrder({ parentId, subpageOrder }) {
-			if (this.allPages[this.collectiveIndex].find((p) => p.id === parentId)) {
-				this.allPages[this.collectiveIndex].find((p) => p.id === parentId).subpageOrder = subpageOrder
+			if (this.allPages[this.currentCollectiveIndex].find((p) => p.id === parentId)) {
+				this.allPages[this.currentCollectiveIndex].find((p) => p.id === parentId).subpageOrder = subpageOrder
 			}
 		},
 
@@ -454,7 +498,7 @@ export const usePagesStore = defineStore('pages', {
 		 * If no index is provided, add to the beginning of the list.
 		 *
 		 * Build subpageOrder of parent page to maintain the displayed order. If no subpageOrder
-		 * was stored before or it missed pages, pages would jump around otherwise.
+		 * was stored before, or it missed pages, pages would jump around otherwise.
 		 *
 		 * @param {object} object parameters object
 		 * @param {number} object.parentId ID of the parent page
@@ -463,7 +507,7 @@ export const usePagesStore = defineStore('pages', {
 		 */
 		addToSubpageOrder({ parentId, pageId, newIndex = 0 }) {
 			// Get current subpage order of parentId
-			const subpageOrder = this.sortedSubpages(parentId, 'byOrder')
+			const subpageOrder = this.currentSortedSubpages(parentId, 'byOrder')
 				.map((p) => p.id)
 				.filter((id) => (id !== pageId))
 
@@ -481,7 +525,7 @@ export const usePagesStore = defineStore('pages', {
 		 * @param {number} object.pageId ID of the page to remove
 		 */
 		deleteFromSubpageOrder({ parentId, pageId }) {
-			const parentPage = this.allPages[this.collectiveIndex].find((p) => (p.id === parentId))
+			const parentPage = this.allPages[this.currentCollectiveIndex].find((p) => (p.id === parentId))
 			this.updateSubpageOrder({ parentId, subpageOrder: parentPage.subpageOrder.filter((id) => (id !== pageId)) })
 		},
 
@@ -508,7 +552,7 @@ export const usePagesStore = defineStore('pages', {
 		},
 
 		expandParents(pageId) {
-			for (const page of this.pageParents(pageId)) {
+			for (const page of this.currentPageParents(pageId)) {
 				this.expand(page.id)
 			}
 		},
@@ -539,9 +583,9 @@ export const usePagesStore = defineStore('pages', {
 		 * @param {object} collective The collective
 		 * @param {boolean} setLoading Whether to set loading pagelist
 		 */
-		async getPagesForCollective(collective, setLoading = true) {
+		async getPages(collective, setLoading = true) {
 			const rootStore = useRootStore()
-			if (setLoading && this.pagesForCollective(collective).length === 0) {
+			if (setLoading && this.pages(collective).length === 0) {
 				rootStore.load(`pagelist-${collective.id}`)
 			}
 			const context = {
@@ -550,7 +594,7 @@ export const usePagesStore = defineStore('pages', {
 				shareTokenParam: null,
 			}
 			const response = await api.getPages(context)
-			this.allPages[this.indexForCollective(collective)] = response.data.ocs.data.pages
+			this.allPages[this.collectiveIndex(collective)] = response.data.ocs.data.pages
 			rootStore.done(`pagelist-${collective.id}`)
 		},
 
@@ -559,13 +603,13 @@ export const usePagesStore = defineStore('pages', {
 		 *
 		 * @param {boolean} setLoading Whether to set loading pagelist
 		 */
-		async getPages(setLoading = true) {
+		async getCurrentPages(setLoading = true) {
 			const rootStore = useRootStore()
 			if (setLoading && !this.pagesLoaded) {
 				rootStore.load('pagelist')
 			}
 			const response = await api.getPages(this.context)
-			this.allPages[this.collectiveIndex] = response.data.ocs.data.pages
+			this.allPages[this.currentCollectiveIndex] = response.data.ocs.data.pages
 			rootStore.done('pagelist')
 		},
 
@@ -580,7 +624,7 @@ export const usePagesStore = defineStore('pages', {
 			const rootStore = useRootStore()
 			rootStore.load('pageTrash')
 			const response = await api.getTrashPages(this.context)
-			this.allTrashPages[this.collectiveIndex] = response.data.ocs.data.pages
+			this.allTrashPages[this.currentCollectiveIndex] = response.data.ocs.data.pages
 			this.setTrashPagesLoaded(true)
 			rootStore.done('pageTrash')
 		},
@@ -589,10 +633,10 @@ export const usePagesStore = defineStore('pages', {
 			this.trashPagesLoaded = loaded
 		},
 
-		_updatePageState(page, collectiveIndex = this.collectiveIndex) {
-			const index = this.allPages[collectiveIndex].findIndex((p) => p.id === page.id)
+		_updatePageState(page, currentCollectiveIndex = this.currentCollectiveIndex) {
+			const index = this.allPages[currentCollectiveIndex].findIndex((p) => p.id === page.id)
 			if (index > -1) {
-				this.allPages[collectiveIndex].splice(index, 1, page)
+				this.allPages[currentCollectiveIndex].splice(index, 1, page)
 			}
 		},
 
@@ -621,7 +665,7 @@ export const usePagesStore = defineStore('pages', {
 			const response = await api.createPage(this.context, page)
 			// Add new page to the beginning of pages array
 			const newPage = response.data.ocs.data.page
-			updateOrAddTo(this.allPages[this.collectiveIndex], newPage)
+			updateOrAddTo(this.allPages[this.currentCollectiveIndex], newPage)
 			this.addToSubpageOrder({ parentId: newPage.parentId, pageId: newPage.id })
 			this.newPage = response.data.ocs.data.page
 		},
@@ -655,7 +699,7 @@ export const usePagesStore = defineStore('pages', {
 		async copyPage({ newParentId, pageId, index }) {
 			const rootStore = useRootStore()
 			rootStore.load('pagelist-nodrag')
-			const page = { ...this.allPages[this.collectiveIndex].find((p) => p.id === pageId) }
+			const page = { ...this.allPages[this.currentCollectiveIndex].find((p) => p.id === pageId) }
 
 			// Keep subpage list of old parent page in DOM to prevent a race condition with sortableJS
 			const oldParentId = page.parentId
@@ -668,7 +712,7 @@ export const usePagesStore = defineStore('pages', {
 			try {
 				await api.copyPage(this.context, pageId, newParentId, index)
 				// Reload the page list to make new page appear
-				await this.getPages(false)
+				await this.getCurrentPages(false)
 			} finally {
 				rootStore.done('pagelist-nodrag')
 			}
@@ -685,15 +729,14 @@ export const usePagesStore = defineStore('pages', {
 		async movePage({ newParentId, pageId, index }) {
 			const rootStore = useRootStore()
 			rootStore.load('pagelist-nodrag')
-			const page = { ...this.allPages[this.collectiveIndex].find((p) => p.id === pageId) }
-			const hasSubpages = this.visibleSubpages(pageId).length > 0
+			const page = { ...this.allPages[this.currentCollectiveIndex].find((p) => p.id === pageId) }
 
 			// Save a clone of the page to restore in case of errors
 			const pageClone = { ...page }
 
 			// Keep subpage list of old parent page in DOM to prevent a race condition with sortableJS
 			const oldParentId = page.parentId
-			this.allPages[this.collectiveIndex].find((p) => p.id === oldParentId).keepSortable = true
+			this.allPages[this.currentCollectiveIndex].find((p) => p.id === oldParentId).keepSortable = true
 
 			// Update page in store first to avoid page order jumping around
 			page.parentId = newParentId
@@ -706,13 +749,13 @@ export const usePagesStore = defineStore('pages', {
 				this._updatePageState(pageClone)
 				throw e
 			} finally {
-				delete this.allPages[this.collectiveIndex].find((p) => p.id === oldParentId).keepSortable
+				delete this.allPages[this.currentCollectiveIndex].find((p) => p.id === oldParentId).keepSortable
 				rootStore.done('pagelist-nodrag')
 			}
 
 			// Reload the page list if moved page had subpages (to get their updated paths)
-			if (hasSubpages) {
-				await this.getPages(false)
+			if (this.hasSubpages(pageId)) {
+				await this.getCurrentPages(false)
 			}
 		},
 
@@ -745,16 +788,15 @@ export const usePagesStore = defineStore('pages', {
 		async movePageToCollective({ collectiveId, newParentId, pageId, index }) {
 			const rootStore = useRootStore()
 			rootStore.load('pagelist-nodrag')
-			const page = { ...this.allPages[this.collectiveIndex].find((p) => p.id === pageId) }
-			const hasSubpages = this.visibleSubpages(pageId).length > 0
+			const page = { ...this.allPages[this.currentCollectiveIndex].find((p) => p.id === pageId) }
 
 			await api.movePageToCollective(this.context, pageId, collectiveId, newParentId, index)
-			removeFrom(this.allPages[this.collectiveIndex], page)
+			removeFrom(this.allPages[this.currentCollectiveIndex], page)
 			rootStore.done('pagelist-nodrag')
 
 			// Reload the page list if moved page had subpages (to remove subpages as well)
-			if (hasSubpages) {
-				await this.getPages(false)
+			if (this.hasSubpages(pageId)) {
+				await this.getCurrentPages(false)
 			}
 		},
 
@@ -798,7 +840,7 @@ export const usePagesStore = defineStore('pages', {
 		async setPageSubpageOrder({ pageId, subpageOrder }) {
 			const rootStore = useRootStore()
 			rootStore.load('pagelist-nodrag')
-			const page = { ...this.allPages[this.collectiveIndex].find((p) => p.id === pageId) }
+			const page = { ...this.allPages[this.currentCollectiveIndex].find((p) => p.id === pageId) }
 
 			// Save a clone of the page to restore in case of errors
 			const pageClone = { ...page }
@@ -831,7 +873,7 @@ export const usePagesStore = defineStore('pages', {
 		 */
 		async addPageTag({ pageId }, tagId) {
 			const rootStore = useRootStore()
-			const page = { ...this.allPages[this.collectiveIndex].find((p) => p.id === pageId) }
+			const page = { ...this.allPages[this.currentCollectiveIndex].find((p) => p.id === pageId) }
 
 			if (page.tags?.includes(tagId)) {
 				return
@@ -871,7 +913,7 @@ export const usePagesStore = defineStore('pages', {
 		 */
 		async removePageTag({ pageId }, tagId) {
 			const rootStore = useRootStore()
-			const page = { ...this.allPages[this.collectiveIndex].find((p) => p.id === pageId) }
+			const page = { ...this.allPages[this.currentCollectiveIndex].find((p) => p.id === pageId) }
 
 			const tagIndex = page.tags?.indexOf(tagId)
 			if (tagIndex === null || tagIndex === -1) {
@@ -912,9 +954,9 @@ export const usePagesStore = defineStore('pages', {
 		async trashPage({ pageId }) {
 			const response = await api.trashPage(this.context, pageId)
 			const trashPage = response.data.ocs.data.page
-			removeFrom(this.allPages[this.collectiveIndex], trashPage)
-			if (this.allTrashPages[this.collectiveIndex]) {
-				updateOrAddTo(this.allTrashPages[this.collectiveIndex], trashPage)
+			removeFrom(this.allPages[this.currentCollectiveIndex], trashPage)
+			if (this.allTrashPages[this.currentCollectiveIndex]) {
+				updateOrAddTo(this.allTrashPages[this.currentCollectiveIndex], trashPage)
 			}
 		},
 
@@ -927,8 +969,8 @@ export const usePagesStore = defineStore('pages', {
 		async restorePage({ pageId }) {
 			const response = await api.restorePage(this.context, pageId)
 			const trashPage = response.data.ocs.data.page
-			updateOrAddTo(this.allPages[this.collectiveIndex], trashPage)
-			removeFrom(this.allTrashPages[this.collectiveIndex], trashPage)
+			updateOrAddTo(this.allPages[this.currentCollectiveIndex], trashPage)
+			removeFrom(this.allTrashPages[this.currentCollectiveIndex], trashPage)
 		},
 
 		/**
@@ -939,7 +981,7 @@ export const usePagesStore = defineStore('pages', {
 		 */
 		async deletePage({ pageId }) {
 			await api.deletePage(this.context, pageId)
-			removeFrom(this.allTrashPages[this.collectiveIndex], { id: pageId })
+			removeFrom(this.allTrashPages[this.currentCollectiveIndex], { id: pageId })
 		},
 
 		/**
@@ -962,16 +1004,16 @@ export const usePagesStore = defineStore('pages', {
 				}
 				if (page.trashTimestamp) {
 					// pages should not be updated in the trash - but better be safe than sorry.
-					updateOrAddTo(this.allTrashPages[this.collectiveIndex], page)
-					removeFrom(this.allPages[this.collectiveIndex], page)
+					updateOrAddTo(this.allTrashPages[this.currentCollectiveIndex], page)
+					removeFrom(this.allPages[this.currentCollectiveIndex], page)
 				} else {
-					updateOrAddTo(this.allPages[this.collectiveIndex], page)
-					removeFrom(this.allTrashPages[this.collectiveIndex], page)
+					updateOrAddTo(this.allPages[this.currentCollectiveIndex], page)
+					removeFrom(this.allTrashPages[this.currentCollectiveIndex], page)
 				}
 			}
 			for (const id of (removed || [])) {
-				removeFrom(this.allTrashPages[this.collectiveIndex], { id })
-				removeFrom(this.allPages[this.collectiveIndex], { id })
+				removeFrom(this.allTrashPages[this.currentCollectiveIndex], { id })
+				removeFrom(this.allPages[this.currentCollectiveIndex], { id })
 			}
 		},
 
@@ -982,10 +1024,10 @@ export const usePagesStore = defineStore('pages', {
 		 */
 		async getAttachments(page) {
 			const response = await api.getPageAttachments(this.context, page.id)
-			if (typeof this.allAttachments[this.collectiveIndex] !== 'object') {
-				this.allAttachments[this.collectiveIndex] = {}
+			if (typeof this.allAttachments[this.currentCollectiveIndex] !== 'object') {
+				this.allAttachments[this.currentCollectiveIndex] = {}
 			}
-			this.allAttachments[this.collectiveIndex][page.id] = response.data.ocs.data.attachments
+			this.allAttachments[this.currentCollectiveIndex][page.id] = response.data.ocs.data.attachments
 				// Disregard deletedAttachments when updating attachments
 				.filter((a) => !this.deletedAttachments.map((a) => a.name).includes(a.name))
 			this.deletedAttachments = this.deletedAttachments
@@ -998,13 +1040,13 @@ export const usePagesStore = defineStore('pages', {
 			formData.append('file', file)
 
 			const response = await api.uploadAttachment(this.context, this.currentPageId, formData)
-			if (typeof this.allAttachments[this.collectiveIndex] !== 'object') {
-				this.allAttachments[this.collectiveIndex] = {}
+			if (typeof this.allAttachments[this.currentCollectiveIndex] !== 'object') {
+				this.allAttachments[this.currentCollectiveIndex] = {}
 			}
-			if (!Array.isArray(this.allAttachments[this.collectiveIndex][this.currentPageId])) {
-				this.allAttachments[this.collectiveIndex][this.currentPageId] = []
+			if (!Array.isArray(this.allAttachments[this.currentCollectiveIndex][this.currentPageId])) {
+				this.allAttachments[this.currentCollectiveIndex][this.currentPageId] = []
 			}
-			this.allAttachments[this.collectiveIndex][this.currentPageId].push(response.data.ocs.data.attachment)
+			this.allAttachments[this.currentCollectiveIndex][this.currentPageId].push(response.data.ocs.data.attachment)
 			return response.data.ocs.data.attachment
 		},
 
@@ -1017,7 +1059,7 @@ export const usePagesStore = defineStore('pages', {
 		async renameAttachment(attachmentId, name) {
 			const response = await api.renameAttachment(this.context, this.currentPageId, attachmentId, name)
 			const index = this.attachments.findIndex((a) => a.id === attachmentId)
-			this.allAttachments[this.collectiveIndex][this.currentPageId].splice(index, 1, response.data.ocs.data.attachment)
+			this.allAttachments[this.currentCollectiveIndex][this.currentPageId].splice(index, 1, response.data.ocs.data.attachment)
 			return response.data.ocs.data.attachment
 		},
 
@@ -1044,7 +1086,7 @@ export const usePagesStore = defineStore('pages', {
 		setAttachmentDeleted(attachmentId) {
 			const index = this.attachments.findIndex((a) => a.id === attachmentId)
 			if (index !== -1) {
-				const [attachment] = this.allAttachments[this.collectiveIndex][this.currentPageId].splice(index, 1)
+				const [attachment] = this.allAttachments[this.currentCollectiveIndex][this.currentPageId].splice(index, 1)
 				this.deletedAttachments.push(attachment)
 			}
 		},
diff --git a/src/views/CollectiveView.vue b/src/views/CollectiveView.vue
index 3f4f75fdf..edc4f141f 100644
--- a/src/views/CollectiveView.vue
+++ b/src/views/CollectiveView.vue
@@ -126,7 +126,7 @@ export default {
 		...mapActions(useSessionsStore, ['createSession', 'updateSession', 'closeSession']),
 		...mapActions(useTagsStore, ['getTags']),
 		...mapActions(useTemplatesStore, ['getTemplates']),
-		...mapActions(usePagesStore, ['getPages']),
+		...mapActions(usePagesStore, ['getCurrentPages']),
 
 		initSession() {
 			if (this.listenPush) {
@@ -207,7 +207,7 @@ export default {
 			}
 
 			try {
-				await this.getPages(setLoading)
+				await this.getCurrentPages(setLoading)
 			} catch (e) {
 				displayError('Could not fetch collective pages')(e)
 				return