diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index c7a8e9ba..a99f72f1 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -874,12 +874,6 @@ function _Chat() {
     context.push(copiedHello);
   }
 
-  // clear context index = context length + index in messages
-  const clearContextIndex =
-    (session.clearContextIndex ?? -1) >= 0
-      ? session.clearContextIndex! + context.length
-      : -1;
-
   // preview messages
   const renderMessages = useMemo(() => {
     return context
@@ -961,6 +955,12 @@ function _Chat() {
     scrollDomToBottom();
   }
 
+  // clear context index = context length + index in messages
+  const clearContextIndex =
+    (session.clearContextIndex ?? -1) >= 0
+      ? session.clearContextIndex! + context.length - msgRenderIndex
+      : -1;
+
   const [showPromptModal, setShowPromptModal] = useState(false);
 
   const clientConfig = useMemo(() => getClientConfig(), []);