diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index bde807476..361f79edb 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -961,7 +961,8 @@ function _Chat() {
     }
 
     setHitBottom(isHitBottom);
-    setAutoScroll(isHitBottom);
+    let isAutoScrollEnabled: boolean = config.autoScrollMessage;
+    setAutoScroll(isAutoScrollEnabled);
   };
 
   function scrollToBottom() {