diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index eee7b9f..731e5f2 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -864,7 +864,8 @@ export default {
       }
       this.showScrollToEnd =
         container.scrollHeight - container.scrollTop.toFixed(0) >
-        container.clientHeight;
+        container.clientHeight || (this.timelineWindow &&
+        this.timelineWindow.canPaginate(EventTimeline.FORWARDS));
 
       this.restartRRTimer();
     },