diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 778951c46..14d19c37b 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -103,13 +103,6 @@ export default {
 				keyboard: this.keyboard
 			});
 	},
-	//to avoid pagelocks if more than one instance
-	beforeUnmount() {
-		if (this.modal) {
-			this.modal.dispose();
-			this.modal = null;
-		}
-	},
 	popup(body, options, title, footer) {
 		const BsModal = this,
 			slots = {};
@@ -164,7 +157,17 @@ export default {
 			});
 		});
 	},
-	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
+	template: `
+	<div
+		ref="modal"
+		class="bootstrap-modal modal"
+		tabindex="-1"
+		@[\`hide.bs.modal\`]="$emit('hideBsModal', $event)"
+		@[\`hidden.bs.modal\`]="$emit('hiddenBsModal', $event)"
+		@[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal', $event)"
+		@[\`show.bs.modal\`]="$emit('showBsModal', $event)"
+		@[\`shown.bs.modal\`]="$emit('shownBsModal', $event)"
+	>
 		<div class="modal-dialog" :class="fullscreen ? 'modal-fullscreen' : dialogClass">
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header" :class="headerClass">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index f6f884dde..726369513 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -317,7 +317,7 @@ export default {
 		<div class="stv-details-kontakt-contact h-100 pt-3">
 
 		<!--Modal: contactModal-->
-		<bs-modal ref="contactModal">
+		<bs-modal ref="contactModal" @hideBsModal.stop="">
 			<template #title>
 				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('person', 'kontakt_new')}}</p>
 				<p v-else class="fw-bold mt-3">{{$p.t('person', 'kontakt_edit')}}</p>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
index eba03b8f7..bfa8a3dbc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
@@ -604,9 +604,11 @@ export default {
 
 	<!--Modal: KontaktdatenModal -->
 	<bs-modal
+		v-if="autocompleteSelectedBetreuer && autocompleteSelectedBetreuer.person_id"
+		@hideBsModal.stop=""
 		ref="kontaktdatenModal"
 		dialog-class="modal-xl modal-dialog-scrollable"
-		v-if="autocompleteSelectedBetreuer && autocompleteSelectedBetreuer.person_id">
+	>
 
 		<template #title>
 			<p class="fw-bold mt-3">{{$p.t('projektarbeit', 'kontaktdatenBearbeiten')}}</p>