diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index 1fbb9b9..cf3f048 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -52,7 +52,7 @@
               touchStart(e, event);
             }
           " v-on:touchend="touchEnd" v-on:touchcancel="touchCancel" v-on:touchmove="touchMove">
-            <component :is="componentForEvent(event)" :room="room" :originalEvent="event" :nextEvent="events[index + 1]"
+            <component :is="componentForEvent(event)" :room="room" :originalEvent="event" :nextEvent="filteredEvents[index + 1]"
               :timelineSet="timelineSet" v-on:send-quick-reaction.stop="sendQuickReaction"
               v-on:context-menu="showContextMenuForEvent($event)" v-on:own-avatar-clicked="viewProfile"
               v-on:other-avatar-clicked="showAvatarMenuForEvent($event)" v-on:download="download(event)"
@@ -64,7 +64,7 @@
               />
             <!-- <div v-if="debugging" style="user-select:text">EventID: {{ event.getId() }}</div> -->
             <!-- <div v-if="debugging" style="user-select:text">Event: {{ JSON.stringify(event) }}</div> -->
-            <div v-if="event.getId() == readMarker && index < events.length - 1" class="read-marker"
+            <div v-if="event.getId() == readMarker && index < filteredEvents.length - 1" class="read-marker"
               :title="$t('message.unread_messages')" />
           </div>
         </div>
diff --git a/src/components/messages/SeenBy.vue b/src/components/messages/SeenBy.vue
index db2d779..9069e7f 100644
--- a/src/components/messages/SeenBy.vue
+++ b/src/components/messages/SeenBy.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="seen-by-container">
-    <v-tooltip top open-delay="500">
+    <v-tooltip top open-delay="500" v-if="seenBy.length > 0">
       <template v-slot:activator="{ on, attrs }">
         <div v-bind="attrs" v-on="on" class="clickable">
           <div class="more" v-if="seenBy.length > 0">{{ moreItems }}</div>