diff --git a/app/store/chat.ts b/app/store/chat.ts
index 1609666c331..d2a1fecd619 100644
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -595,9 +595,13 @@ export const useChatStore = createPersistStore(
             countMessages(messages) >= SUMMARIZE_MIN_LEN) ||
           refreshTitle
         ) {
+          const startIndex = Math.max(
+            0,
+            messages.length - modelConfig.historyMessageCount,
+          );
           const topicMessages = messages
             .slice(
-              messages.length - modelConfig.historyMessageCount,
+              startIndex < messages.length ? startIndex : messages.length - 1,
               messages.length,
             )
             .concat(