diff --git a/src/components/GuestNamePicker.vue b/src/components/GuestNamePicker.vue
index 333a13a546..86bcab33e3 100644
--- a/src/components/GuestNamePicker.vue
+++ b/src/components/GuestNamePicker.vue
@@ -39,10 +39,10 @@
 </template>
 
 <script>
+import { setGuestNickname } from '@nextcloud/auth'
 import { NcButton, NcIconSvgWrapper, NcModal, NcTextField } from '@nextcloud/vue'
 import { translate as t } from '@nextcloud/l10n'
 import axios from '@nextcloud/axios'
-import { setGuestNameCookie } from '../helpers/guestName.js'
 
 export default {
 	name: 'GuestNamePicker',
@@ -103,10 +103,10 @@ export default {
 			this.guestName = guestName
 		},
 		async submit() {
-			setGuestNameCookie(this.guestName)
+			setGuestNickname(this.guestName)
 			this.show = false
 
-			await this.onSubmit(this.guestName)
+			await this.onSubmit()
 		},
 	},
 }
diff --git a/src/helpers/guestName.js b/src/helpers/guestName.js
index a293c74409..f2c9cdbff1 100644
--- a/src/helpers/guestName.js
+++ b/src/helpers/guestName.js
@@ -20,7 +20,10 @@
  *
  */
 
-import { getCurrentUser } from '@nextcloud/auth'
+import {
+	getCurrentUser,
+	getGuestNickname,
+} from '@nextcloud/auth'
 import getLoggedInUser from '../helpers/getLoggedInUser.js'
 
 const cookieAlreadySet = (cookieName) => {
@@ -39,7 +42,7 @@ const setGuestNameCookie = (username) => {
 
 const shouldAskForGuestName = () => {
 	const noLoggedInUser = !getLoggedInUser()
-	const noGuestCookie = !cookieAlreadySet('guestUser')
+	const noGuest = !getGuestNickname()
 	const noCurrentUser = !getCurrentUser() || getCurrentUser()?.uid === ''
 
 	return noLoggedInUser && noGuestCookie && noCurrentUser
diff --git a/src/view/Office.vue b/src/view/Office.vue
index 148013a72d..f414c58611 100644
--- a/src/view/Office.vue
+++ b/src/view/Office.vue
@@ -132,7 +132,7 @@ import pickLink from '../mixins/pickLink.js'
 import saveAs from '../mixins/saveAs.js'
 import uiMention from '../mixins/uiMention.js'
 import version from '../mixins/version.js'
-import { getCurrentUser } from '@nextcloud/auth'
+import { getCurrentUser, getGuestNickname } from '@nextcloud/auth'
 import { shouldAskForGuestName } from '../helpers/guestName.js'
 
 const FRAME_DOCUMENT = 'FRAME_DOCUMENT'
@@ -191,8 +191,6 @@ export default {
 			errorType: null,
 			loadingMsg: null,
 
-			guestName: null,
-
 			showLinkPicker: false,
 			showZotero: false,
 			modified: false,
@@ -293,8 +291,7 @@ export default {
 
 			spawnDialog(GuestNamePicker, {
 				fileName: basename(this.filename),
-				onSubmit: async (guestName) => {
-					this.guestName = guestName
+				onSubmit: async () => {
 					await this.load()
 				},
 			})
@@ -314,7 +311,7 @@ export default {
 
 			// Generate WOPI token
 			const { data } = await axios.post(generateUrl('/apps/richdocuments/token'), {
-				fileId: fileid, shareToken: this.shareToken, version, guestName: this.guestName,
+				fileId: fileid, shareToken: this.shareToken, version, guestName: getGuestNickname(),
 			})
 			Config.update('urlsrc', data.urlSrc)
 			Config.update('wopi_callback_url', loadState('richdocuments', 'wopi_callback_url', ''))