diff --git a/src/components/MediaSettings/MediaSettings.vue b/src/components/MediaSettings/MediaSettings.vue
index 2fa56d32b52..d0213f3c579 100644
--- a/src/components/MediaSettings/MediaSettings.vue
+++ b/src/components/MediaSettings/MediaSettings.vue
@@ -189,10 +189,7 @@
 					</MediaSettingsTabs>
 
 					<!-- Guest display name setting-->
-					<SetGuestUsername
-						v-if="isGuest"
-						compact
-						@update="guestUserName = $event" />
+					<SetGuestUsername v-if="isGuest" compact />
 
 					<!-- Moderator options before starting a call-->
 					<NcCheckboxRadioSwitch
@@ -407,7 +404,6 @@ export default {
 			skipBlurVirtualBackground: false,
 			mediaLoading: false,
 			isDeviceCheck: false,
-			guestUserName: '',
 		}
 	},
 
@@ -416,13 +412,6 @@ export default {
 			return this.actorStore.displayName
 		},
 
-		guestName() {
-			return this.guestNameStore.getGuestName(
-				this.token,
-				this.actorStore.actorId,
-			)
-		},
-
 		isGuest() {
 			return !this.userId && this.actorStore.actorType === ATTENDEE.ACTOR_TYPE.GUESTS
 		},
@@ -583,7 +572,7 @@ export default {
 
 		disabledCallButton() {
 			return (this.isRecordingConsentRequired && !this.recordingConsentGiven)
-				|| (this.isGuest && !this.guestUserName.length)
+				|| (this.isGuest && !this.guestNameStore.guestUserName.length)
 		},
 
 		forceShowMediaSettings() {
diff --git a/src/components/SetGuestUsername.vue b/src/components/SetGuestUsername.vue
index 9c62e17a5df..775211ab3f7 100644
--- a/src/components/SetGuestUsername.vue
+++ b/src/components/SetGuestUsername.vue
@@ -48,7 +48,6 @@
 <script setup lang="ts">
 import type { NextcloudUser } from '@nextcloud/auth'
 
-import { getGuestNickname } from '@nextcloud/auth'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
@@ -68,9 +67,6 @@ const { compact = false } = defineProps<{
 	compact?: boolean
 }>()
 
-const emit = defineEmits<{
-	(event: 'update', value: string): void
-}>()
 const loginUrl = `${generateUrl('/login')}?redirect_url=${encodeURIComponent(window.location.pathname)}`
 
 const actorStore = useActorStore()
@@ -84,7 +80,6 @@ const guestUserName = computed({
 	set: (newValue: string) => {
 		guestNameStore.guestUserName = newValue
 		debounceUpdateDisplayName()
-		emit('update', newValue)
 	},
 })
 const isEditingUsername = ref(false)