diff --git a/src/App.vue b/src/App.vue
index dc1f4cae93e..9c32d96b480 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,7 +13,6 @@
 			<router-view />
 		</NcAppContent>
 		<RightSidebar :is-in-call="isInCall" />
-		<PreventUnload :when="warnLeaving || isSendingMessages" />
 		<MediaSettings :recording-consent-given.sync="recordingConsentGiven" />
 		<SettingsDialog />
 		<ConversationSettingsDialog />
@@ -23,7 +22,6 @@
 <script>
 import debounce from 'debounce'
 import { provide } from 'vue'
-import PreventUnload from 'vue-prevent-unload'
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
@@ -58,7 +56,6 @@ export default {
 		NcAppContent,
 		NcContent,
 		LeftSidebar,
-		PreventUnload,
 		RightSidebar,
 		SettingsDialog,
 		ConversationSettingsDialog,
@@ -246,6 +243,10 @@ export default {
 		}
 	},
 
+	created() {
+		window.addEventListener('beforeunload', this.preventUnload)
+	},
+
 	beforeDestroy() {
 		this.debounceRefreshCurrentConversation.clear?.()
 		if (!getCurrentUser()) {
@@ -254,6 +255,8 @@ export default {
 		document.removeEventListener('visibilitychange', this.changeWindowVisibility)
 
 		unsubscribe('notifications:action:execute', this.interceptNotificationActions)
+
+		window.removeEventListener('beforeunload', this.preventUnload)
 	},
 
 	beforeMount() {
@@ -671,6 +674,14 @@ export default {
 			this.windowHeight = window.innerHeight - document.getElementById('header').clientHeight
 		},
 
+		preventUnload(event) {
+			if (!this.warnLeaving && !this.isSendingMessages) {
+				return
+			}
+
+			event.preventDefault()
+		},
+
 		/**
 		 * Get a conversation's name.
 		 *
diff --git a/src/FilesSidebarCallViewApp.vue b/src/FilesSidebarCallViewApp.vue
index 022409e29f4..d234049d4a3 100644
--- a/src/FilesSidebarCallViewApp.vue
+++ b/src/FilesSidebarCallViewApp.vue
@@ -11,13 +11,10 @@
 		<CallView v-if="showCallView"
 			:token="token"
 			:is-sidebar="true" />
-		<PreventUnload :when="warnLeaving" />
 	</div>
 </template>
 
 <script>
-import PreventUnload from 'vue-prevent-unload'
-
 import LoadingComponent from './components/LoadingComponent.vue'
 
 import { useHashCheck } from './composables/useHashCheck.js'
@@ -35,7 +32,6 @@ export default {
 				render: (h) => h(LoadingComponent, { class: 'call-loading' }),
 			},
 		}),
-		PreventUnload,
 		TopBar: () => import(/* webpackChunkName: "files-sidebar-call-chunk" */'./components/TopBar/TopBar.vue'),
 	},
 
@@ -147,7 +143,23 @@ export default {
 		},
 	},
 
+	created() {
+		window.addEventListener('beforeunload', this.preventUnload)
+	},
+
+	beforeDestroy() {
+		window.removeEventListener('beforeunload', this.preventUnload)
+	},
+
 	methods: {
+		preventUnload(event) {
+			if (!this.warnLeaving) {
+				return
+			}
+
+			event.preventDefault()
+		},
+
 		setFileInfo(fileInfo) {
 		},
 
diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index 0629d2a1ba2..9e10e5fdef2 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -26,7 +26,6 @@
 				<CallView v-if="isInCall"
 					:token="token"
 					:is-sidebar="true" />
-				<PreventUnload :when="warnLeaving" />
 				<CallButton class="call-button" />
 				<ChatView />
 				<PollViewer />
@@ -37,8 +36,6 @@
 </template>
 
 <script>
-import PreventUnload from 'vue-prevent-unload'
-
 import { showError } from '@nextcloud/dialogs'
 import { loadState } from '@nextcloud/initial-state'
 
@@ -64,7 +61,6 @@ import { checkBrowser } from './utils/browserCheck.js'
 import { signalingKill } from './utils/webrtc/index.js'
 
 export default {
-
 	name: 'PublicShareSidebar',
 
 	components: {
@@ -74,7 +70,6 @@ export default {
 		MediaSettings,
 		NcButton,
 		PollViewer,
-		PreventUnload,
 		TopBar,
 		TransitionWrapper,
 	},
@@ -126,6 +121,10 @@ export default {
 		},
 	},
 
+	created() {
+		window.addEventListener('beforeunload', this.preventUnload)
+	},
+
 	beforeMount() {
 		window.addEventListener('unload', () => {
 			if (this.token) {
@@ -139,7 +138,18 @@ export default {
 		})
 	},
 
+	beforeDestroy() {
+		window.removeEventListener('beforeunload', this.preventUnload)
+	},
+
 	methods: {
+		preventUnload(event) {
+			if (!this.warnLeaving) {
+				return
+			}
+
+			event.preventDefault()
+		},
 
 		async joinConversation() {
 			checkBrowser()