diff --git a/src/views/Notifications.vue b/src/views/Notifications.vue
index 78754ce..09bd53e 100644
--- a/src/views/Notifications.vue
+++ b/src/views/Notifications.vue
@@ -31,6 +31,7 @@
     <section v-else class="notifications | flow">
       <template v-for="notification in notifications" :key="notification.id">
         <router-link
+          v-if="currentTab === 'all' || !notification.isRead"
           :to="notification.page.uri + '?fileUuid=' + notification.file.uuid"
         >
           <article
@@ -128,7 +129,9 @@ const tabs = computed(() => {
   ];
 });
 
-const comments = Object.values(user.notifications.comments);
+const comments = user?.notifications?.comments
+  ? Object.values(user.notifications.comments)
+  : [];
 
 const notifications = [...comments];