diff --git a/frontend/src/components/Messages.svelte b/frontend/src/components/Messages.svelte
index 645c745..f22ff23 100644
--- a/frontend/src/components/Messages.svelte
+++ b/frontend/src/components/Messages.svelte
@@ -25,8 +25,8 @@
     });
 
     const onScroll = (e) => {
-        const { scrollTop, offsetHeight, scrollHeight } = e.target;
-        if ((scrollTop + offsetHeight) >= (scrollHeight - 10)) { // user scrolled to bottom
+        const { scrollHeight, scrollTop, clientHeight } = e.target;
+        if ((scrollHeight - scrollTop - clientHeight) <= 20) { // user scrolled to bottom
             messages.setIsCollectingOldMessages(true);
             shouldAutoscroll = true;
             isScrolledToBottom = true;