diff --git a/src/components/chat/hooks/useChatSessionState.ts b/src/components/chat/hooks/useChatSessionState.ts
index 3330e21b..9103e28a 100644
--- a/src/components/chat/hooks/useChatSessionState.ts
+++ b/src/components/chat/hooks/useChatSessionState.ts
@@ -344,12 +344,11 @@ export function useChatSessionState({
             setHasMoreMessages(false);
             allMessagesLoadedRef.current = true;
             setAllMessagesLoaded(true);
-            if (!loadAllOverlayTimerRef.current) {
-              loadAllOverlayTimerRef.current = setTimeout(() => {
-                setShowLoadAllOverlay(false);
-                loadAllOverlayTimerRef.current = null;
-              }, 2500);
+            if (loadAllOverlayTimerRef.current) {
+              clearTimeout(loadAllOverlayTimerRef.current);
+              loadAllOverlayTimerRef.current = null;
             }
+            setShowLoadAllOverlay(false);
           }
           return false;
         }
@@ -361,12 +360,11 @@ export function useChatSessionState({
         if (!slot.hasMore) {
           allMessagesLoadedRef.current = true;
           setAllMessagesLoaded(true);
-          if (!loadAllOverlayTimerRef.current) {
-            loadAllOverlayTimerRef.current = setTimeout(() => {
-              setShowLoadAllOverlay(false);
-              loadAllOverlayTimerRef.current = null;
-            }, 2500);
+          if (loadAllOverlayTimerRef.current) {
+            clearTimeout(loadAllOverlayTimerRef.current);
+            loadAllOverlayTimerRef.current = null;
           }
+          setShowLoadAllOverlay(false);
         }
         return true;
       } finally {