diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue
index 79275757ba8..1bde367b9b7 100644
--- a/src/components/AvatarWrapper/AvatarWrapper.vue
+++ b/src/components/AvatarWrapper/AvatarWrapper.vue
@@ -9,12 +9,13 @@
 			v-if="isSpecialAvatar"
 			:key="(isDarkTheme ? 'dark-' : 'light-') + '_' + id"
 			class="avatar"
-			:user="name + '_' + id"
+			:user="id"
 			:url="!isFederatedUser ? undefined : avatarUrl"
 			:icon-class="iconClass"
 			:display-name="name"
 			:disable-tooltip="disableTooltip"
 			disable-menu
+			is-no-user
 			:hide-status="!showUserStatus"
 			:verbose-status="false"
 			:preloaded-user-status="preloadedUserStatus ?? {}"
diff --git a/src/components/SetGuestUsername.vue b/src/components/SetGuestUsername.vue
index 1b6ccb36ca7..9c62e17a5df 100644
--- a/src/components/SetGuestUsername.vue
+++ b/src/components/SetGuestUsername.vue
@@ -79,17 +79,26 @@ const token = useGetToken()
 
 const usernameInput = useTemplateRef('usernameInput')
 
-const guestUserName = ref(getGuestNickname() || '')
+const guestUserName = computed({
+	get: () => guestNameStore.guestUserName,
+	set: (newValue: string) => {
+		guestNameStore.guestUserName = newValue
+		debounceUpdateDisplayName()
+		emit('update', newValue)
+	},
+})
 const isEditingUsername = ref(false)
 
 const actorDisplayName = computed<string>(() => actorStore.displayName || guestUserName.value)
 const displayNameLabel = computed(() => t('spreed', 'Display name: {name}', {
 	name: `<strong>${escapeHtml(actorDisplayName.value)}</strong>`,
 }, { escape: false }))
-const debounceUpdateDisplayName = debounce(updateDisplayName, 500)
+const debounceUpdateDisplayName = debounce(updateDisplayName, 10_000)
 
 watch(actorDisplayName, (newValue) => {
-	guestUserName.value = newValue
+	if (newValue && newValue !== guestUserName.value) {
+		guestUserName.value = newValue
+	}
 })
 
 /** Initially set displayName in store, if available from BrowserStorage */
@@ -111,7 +120,7 @@ EventBus.once('joined-conversation', () => {
 subscribe('user:info:changed', updateDisplayNameFromPublicEvent)
 onBeforeUnmount(() => {
 	unsubscribe('user:info:changed', updateDisplayNameFromPublicEvent)
-	updateDisplayName()
+	debounceUpdateDisplayName.flush?.()
 })
 
 /**
@@ -144,12 +153,6 @@ function toggleEdit() {
 		})
 	}
 }
-
-// One-way binding to parent component
-watch(guestUserName, (newValue) => {
-	debounceUpdateDisplayName()
-	emit('update', newValue)
-}, { immediate: true })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/composables/useGetMessages.ts b/src/composables/useGetMessages.ts
index fbeedab57d0..6d7cae3cece 100644
--- a/src/composables/useGetMessages.ts
+++ b/src/composables/useGetMessages.ts
@@ -510,12 +510,12 @@ export function useGetMessagesProvider() {
 		try {
 			debugTimer.start(`${token} | long polling`)
 			// TODO: move polling logic to the store and also cancel timers on cancel
-			pollingErrorTimeout = 1_000
 			await store.dispatch('pollNewMessages', {
 				token,
 				lastKnownMessageId: chatStore.getLastKnownId(token),
 				requestId: token,
 			})
+			pollingErrorTimeout = 1_000
 			debugTimer.end(`${token} | long polling`, 'status 200')
 			tryChatRelay()
 		} catch (exception) {
diff --git a/src/stores/__tests__/guestName.spec.js b/src/stores/__tests__/guestName.spec.js
index fa6f8aa909e..d0a8e82a922 100644
--- a/src/stores/__tests__/guestName.spec.js
+++ b/src/stores/__tests__/guestName.spec.js
@@ -17,6 +17,7 @@ vi.mock('../../services/participantsService', () => ({
 }))
 vi.mock('@nextcloud/auth', () => ({
 	getCurrentUser: vi.fn(),
+	getGuestNickname: vi.fn(),
 	setGuestNickname: vi.fn(),
 }))
 
diff --git a/src/stores/guestName.js b/src/stores/guestName.js
index 16091d856d0..c82101a2fcf 100644
--- a/src/stores/guestName.js
+++ b/src/stores/guestName.js
@@ -1,10 +1,10 @@
-import { setGuestNickname } from '@nextcloud/auth'
-import { emit } from '@nextcloud/event-bus'
-import { t } from '@nextcloud/l10n'
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
+import { getGuestNickname, setGuestNickname } from '@nextcloud/auth'
+import { t } from '@nextcloud/l10n'
 import { defineStore } from 'pinia'
 import { setGuestUserName } from '../services/participantsService.js'
 import { useActorStore } from './actor.ts'
@@ -12,6 +12,7 @@ import { useActorStore } from './actor.ts'
 export const useGuestNameStore = defineStore('guestName', {
 	state: () => ({
 		guestNames: {},
+		guestUserName: getGuestNickname() || '',
 	}),
 
 	actions: {