diff --git a/src/components/Editor/GuestNameDialog.vue b/src/components/Editor/GuestNameDialog.vue
index e7856668cec..ccbc77488b0 100644
--- a/src/components/Editor/GuestNameDialog.vue
+++ b/src/components/Editor/GuestNameDialog.vue
@@ -72,12 +72,12 @@ export default {
 		},
 	},
 	beforeMount() {
-		this.guestName = this.$syncService.session.guestName
+		this.guestName = this.$syncService.connection.session.guestName
 		this.updateBufferedGuestName()
 	},
 	methods: {
 		setGuestName() {
-			const previousGuestName = this.$syncService.session.guestName
+			const previousGuestName = this.$syncService.connection.session.guestName
 			this.$syncService.updateSession(this.guestName).then(() => {
 				localStorage.setItem('nick', this.guestName)
 				this.updateBufferedGuestName()
diff --git a/src/components/Editor/SessionList.vue b/src/components/Editor/SessionList.vue
index 83431692cfa..d7102672da6 100644
--- a/src/components/Editor/SessionList.vue
+++ b/src/components/Editor/SessionList.vue
@@ -108,7 +108,7 @@ export default {
 			},
 		},
 		participantsPopover() {
-			if (this.currentSession.guestName) {
+			if (this.currentSession?.guestName) {
 				return this.participantsWithoutCurrent
 			}
 			return this.participants
diff --git a/src/components/Editor/Status.vue b/src/components/Editor/Status.vue
index 878103a724c..0f85e74177d 100644
--- a/src/components/Editor/Status.vue
+++ b/src/components/Editor/Status.vue
@@ -36,7 +36,7 @@
 			<p slot="lastSaved" class="last-saved">
 				{{ t('text', 'Last saved') }}: {{ lastSavedString }}
 			</p>
-			<GuestNameDialog v-if="$isPublic && !currentSession.userId" :session="currentSession" />
+			<GuestNameDialog v-if="$isPublic && currentSession && !currentSession.userId" :session="currentSession" />
 		</SessionList>
 	</div>
 </template>
diff --git a/src/services/SessionApi.js b/src/services/SessionApi.js
index 8c592a7bd29..69d848b3cd3 100644
--- a/src/services/SessionApi.js
+++ b/src/services/SessionApi.js
@@ -75,6 +75,7 @@ export class Connection {
 		this.#content = content
 		this.#documentState = documentState
 		this.#options = options
+		this.isPublic = !!options.shareToken
 		this.closed = false
 	}
 
diff --git a/src/services/SyncService.js b/src/services/SyncService.js
index 490de22db98..7e214915736 100644
--- a/src/services/SyncService.js
+++ b/src/services/SyncService.js
@@ -132,7 +132,7 @@ class SyncService {
 
 	updateSession(guestName) {
 		if (!this.connection.isPublic) {
-			return
+			return Promise.reject()
 		}
 		return this.connection.update(guestName)
 			.catch((error) => {