diff --git a/src/components/Activity/ActivityItem.vue b/src/components/Activity/ActivityItem.vue
index b076bb44ef..dc3eab3152 100644
--- a/src/components/Activity/ActivityItem.vue
+++ b/src/components/Activity/ActivityItem.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import moment from '@nextcloud/moment'
+import { DateTime } from 'luxon'
 
 import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
 import NcRichText from '@nextcloud/vue/components/NcRichText'
@@ -20,7 +20,7 @@ const props = defineProps({
 })
 
 const dateActivityRelative = computed(() =>
-	moment(props.activity.datetime).fromNow(),
+	DateTime.fromISO(props.activity.datetime).toRelative(),
 )
 
 const message = computed(() => {
@@ -32,7 +32,9 @@ const message = computed(() => {
 		&& parameters.after.id.startsWith('dt:')
 	) {
 		const dateTime = parameters.after.id.slice(3)
-		parameters.after.name = moment(dateTime).format('L LTS')
+		parameters.after.name = DateTime.fromISO(dateTime).toLocaleString(
+			DateTime.DATETIME_SHORT,
+		)
 	}
 
 	Object.keys(parameters).forEach(function (key) {
diff --git a/src/components/SideBar/SideBarTabActivity.vue b/src/components/SideBar/SideBarTabActivity.vue
index d832b0b197..903feeb245 100644
--- a/src/components/SideBar/SideBarTabActivity.vue
+++ b/src/components/SideBar/SideBarTabActivity.vue
@@ -6,7 +6,6 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted } from 'vue'
 import { t } from '@nextcloud/l10n'
-import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 
@@ -14,7 +13,7 @@ import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
 
 import Activities from '../Activity/Activities.vue'
 import { useActivityStore } from '../../stores/activity'
-import { Event } from '../../Types'
+import { onBeforeRouteUpdate } from 'vue-router'
 
 const activityStore = useActivityStore()
 const emptyContentProps = {
@@ -26,11 +25,15 @@ const showEmptyContent = computed(
 )
 
 onMounted(() => {
-	subscribe(Event.UpdateActivity, () => activityStore.load())
+	activityStore.load()
+})
+
+onBeforeRouteUpdate(async () => {
+	activityStore.load()
 })
 
 onUnmounted(() => {
-	unsubscribe(Event.UpdateActivity, () => activityStore.load())
+	activityStore.$reset()
 })
 </script>