diff --git a/src/components/NotificationCentre.vue b/src/components/NotificationCentre.vue
index 40b3bd8..e6f19a3 100644
--- a/src/components/NotificationCentre.vue
+++ b/src/components/NotificationCentre.vue
@@ -88,13 +88,7 @@ const eventsOrdered = computed(() => {
         </a>
       </div>
       <div class="overflow-y-auto">
-        <div
-          v-if="!events.value || Object.keys(events.value).length === 0"
-          class="pt-6 pb-4 text-gray-900 dark:text-white"
-        >
-          No events
-        </div>
-        <div class="flow-root">
+        <div class="flow-root" v-if="eventsOrdered && Object.keys(eventsOrdered).length > 0">
           <ul role="list" class="text-left divide-y divide-gray-200 dark:divide-gray-700">
             <li
               v-for="(
@@ -152,6 +146,7 @@ const eventsOrdered = computed(() => {
             </li>
           </ul>
         </div>
+        <div class="pt-6 pb-4 text-gray-900 dark:text-white" v-else>No events</div>
       </div>
     </div>
   </div>
diff --git a/src/stores/events.js b/src/stores/events.js
index 343267e..ed9cf08 100644
--- a/src/stores/events.js
+++ b/src/stores/events.js
@@ -44,25 +44,19 @@ export const useEventsStore = defineStore(
     }
 
     function clearEvent(eventId) {
-      delete events.value[eventId]
-      // events.value = events.value.filter((_, index) => index !== idx)
+      events.value = Object.entries(events.value).map(([evtId, event]) => {
+        if (evtId != eventId) {
+          return event
+        }
+      })
     }
 
-    function updateModerated(requestId, moderated) {
-      for ([eventId, { reqId }] in Object.entries(events.value)) {
+    function updateModerated(reqId, moderated) {
+      Object.entries(events.value).forEach(([eventId, { requestId }]) => {
         if (reqId === requestId) {
           events.value[eventId].moderated = moderated
-          break
         }
-      }
-      // events.value = events.value.map((event) => {
-      //   if (event) {
-      //     if (event.requestId === requestId) {
-      //       event.moderated = moderated
-      //     }
-      //     return event
-      //   }
-      // })
+      })
     }
 
     async function listenForNewEvents() {