diff --git a/src/components/CallView/shared/LocalVideo.vue b/src/components/CallView/shared/LocalVideo.vue
index 1e08fd95866..8b49c055f0d 100644
--- a/src/components/CallView/shared/LocalVideo.vue
+++ b/src/components/CallView/shared/LocalVideo.vue
@@ -49,9 +49,6 @@
 </template>
 
 <script>
-import Hex from 'crypto-js/enc-hex.js'
-import SHA1 from 'crypto-js/sha1.js'
-
 import { showError, showInfo, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
@@ -62,7 +59,6 @@ import VideoBackground from './VideoBackground.vue'
 import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 
 import { AVATAR } from '../../../constants.js'
-import { useGuestNameStore } from '../../../stores/guestName.js'
 import attachMediaStream from '../../../utils/attachmediastream.js'
 import { ConnectionState } from '../../../utils/webrtc/models/CallParticipantModel.js'
 
@@ -126,11 +122,6 @@ export default {
 
 	emits: ['click-video'],
 
-	setup() {
-		const guestNameStore = useGuestNameStore()
-		return { guestNameStore }
-	},
-
 	data() {
 		return {
 			notificationHandle: null,
@@ -187,17 +178,6 @@ export default {
 			return this.$store.getters.getDisplayName()
 		},
 
-		sessionHash() {
-			return Hex.stringify(SHA1(this.localCallParticipantModel.attributes.peerId))
-		},
-
-		guestName() {
-			return this.guestNameStore.getGuestName(
-				this.$store.getters.getToken(),
-				this.sessionHash,
-			)
-		},
-
 		avatarSize() {
 			if (this.isStripe || (!this.isBig && !this.isGrid)) {
 				return AVATAR.SIZE.LARGE
diff --git a/src/components/CallView/shared/ReactionToaster.vue b/src/components/CallView/shared/ReactionToaster.vue
index a93ef79cf9f..3b484214cc3 100644
--- a/src/components/CallView/shared/ReactionToaster.vue
+++ b/src/components/CallView/shared/ReactionToaster.vue
@@ -180,17 +180,17 @@ export default {
 		},
 
 		getParticipantName(model) {
-			const { name, peerId } = model.attributes
+			const { name, nextcloudSessionId } = model.attributes
 			if (name) {
 				return name
 			}
 
-			const participant = this.participants.find(participant => participant.sessionIds.includes(peerId))
+			const participant = this.participants.find(participant => participant.sessionIds.includes(nextcloudSessionId))
 			if (participant?.displayName) {
 				return participant.displayName
 			}
 
-			return this.guestNameStore.getGuestName(this.token, Hex.stringify(SHA1(peerId)))
+			return this.guestNameStore.getGuestName(this.token, Hex.stringify(SHA1(nextcloudSessionId)))
 		},
 
 		getReactionURL(emoji) {
diff --git a/src/components/CallView/shared/Screen.vue b/src/components/CallView/shared/Screen.vue
index f6c4871f131..657fff561ea 100644
--- a/src/components/CallView/shared/Screen.vue
+++ b/src/components/CallView/shared/Screen.vue
@@ -88,7 +88,7 @@ export default {
 				return null
 			}
 
-			return Hex.stringify(SHA1(this.callParticipantModel.attributes.peerId))
+			return Hex.stringify(SHA1(this.callParticipantModel.attributes.nextcloudSessionId))
 		},
 
 		remoteParticipantName() {
diff --git a/src/components/CallView/shared/VideoVue.vue b/src/components/CallView/shared/VideoVue.vue
index 808b2d895a2..657bf4334d4 100644
--- a/src/components/CallView/shared/VideoVue.vue
+++ b/src/components/CallView/shared/VideoVue.vue
@@ -330,11 +330,11 @@ export default {
 		},
 
 		sessionHash() {
-			return Hex.stringify(SHA1(this.peerId))
+			return Hex.stringify(SHA1(this.nextcloudSessionId))
 		},
 
 		peerData() {
-			let peerData = this.$store.getters.getPeer(this.$store.getters.getToken(), this.peerId, this.model.attributes.userId)
+			let peerData = this.$store.getters.getPeer(this.$store.getters.getToken(), this.nextcloudSessionId, this.model.attributes.userId)
 			if (!peerData.actorId) {
 				EventBus.emit('refresh-peer-list')
 				peerData = {
@@ -352,7 +352,7 @@ export default {
 			 * via the participant list
 			 */
 			return this.$store.getters.findParticipant(this.$store.getters.getToken(), {
-				sessionId: this.peerId,
+				sessionId: this.nextcloudSessionId,
 			}) || {}
 		},
 
@@ -514,6 +514,10 @@ export default {
 		peerId() {
 			return this.model.attributes.peerId
 		},
+
+		nextcloudSessionId() {
+			return this.model.attributes.nextcloudSessionId
+		},
 	},
 
 	watch: {