diff --git a/web/src/components/markdown-content/index.tsx b/web/src/components/markdown-content/index.tsx
index 518756f95..6e93bf134 100644
--- a/web/src/components/markdown-content/index.tsx
+++ b/web/src/components/markdown-content/index.tsx
@@ -213,7 +213,7 @@ const MarkdownContent = ({
         return (
           <HoverCard key={i}>
             <HoverCardTrigger>
-              <span className="text-text-secondary bg-bg-card rounded-2xl px-1 mx-1">
+              <span className="text-text-secondary bg-bg-card rounded-2xl px-1 mx-1 text-nowrap">
                 Fig. {chunkIndex + 1}
               </span>
             </HoverCardTrigger>
diff --git a/web/src/pages/next-chats/utils.ts b/web/src/pages/next-chats/utils.ts
index ab640b7ac..260bc5350 100644
--- a/web/src/pages/next-chats/utils.ts
+++ b/web/src/pages/next-chats/utils.ts
@@ -32,7 +32,10 @@ export const buildMessageItemReference = (
   message: IMessage,
 ) => {
   const assistantMessages = conversation.message
-    ?.filter((x) => x.role === MessageType.Assistant)
+    ?.filter(
+      (x) =>
+        x.role === MessageType.Assistant && !x.content.startsWith('**ERROR**:'), // Exclude error messages
+    )
     .slice(1);
   const referenceIndex = assistantMessages.findIndex(
     (x) => x.id === message.id,