diff --git a/apps/user_status/src/components/ResetStatus.vue b/apps/user_status/src/components/ResetStatus.vue
index 48f0cc1e28e60..867c934821f1c 100644
--- a/apps/user_status/src/components/ResetStatus.vue
+++ b/apps/user_status/src/components/ResetStatus.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex'
+import { mapState } from 'vuex'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { getCurrentUser } from '@nextcloud/auth'
 
diff --git a/apps/user_status/src/components/SetStatusModal.vue b/apps/user_status/src/components/SetStatusModal.vue
index 2f370f1ffb352..c26075b98c8d3 100644
--- a/apps/user_status/src/components/SetStatusModal.vue
+++ b/apps/user_status/src/components/SetStatusModal.vue
@@ -74,6 +74,7 @@
 </template>
 
 <script>
+import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { showError } from '@nextcloud/dialogs'
 import EmojiPicker from '@nextcloud/vue/dist/Components/EmojiPicker'
 import Modal from '@nextcloud/vue/dist/Components/Modal'
@@ -136,6 +137,9 @@ export default {
 		}
 		subscribe('user_status:status.updated', this.handleUserStatusUpdated)
 	},
+	beforeDestroy() {
+		unsubscribe('user_status:status.updated', this.handleUserStatusUpdated)
+	},
 	methods: {
 		/**
 		 * Closes the Set Status modal