diff --git a/web/src/app/chat/message/Messages.tsx b/web/src/app/chat/message/Messages.tsx
index c8a95c4edfd2..9ee7f47a6301 100644
--- a/web/src/app/chat/message/Messages.tsx
+++ b/web/src/app/chat/message/Messages.tsx
@@ -520,6 +520,7 @@ export const AIMessage = ({
                       </div>
                     )}
                   </div>
+
                   {handleFeedback &&
                     (isActive ? (
                       <div
diff --git a/web/src/components/search/SearchSection.tsx b/web/src/components/search/SearchSection.tsx
index fab9218a64af..a54ccf7ab0b2 100644
--- a/web/src/components/search/SearchSection.tsx
+++ b/web/src/components/search/SearchSection.tsx
@@ -723,7 +723,7 @@ export const SearchSection = ({
                           />
                         </div>
 
-                        {quotes !== null && answer && (
+                        {quotes !== null && quotes.length > 0 && answer && (
                           <div className="pt-1 border-t border-border w-full">
                             <QuotesSection
                               quotes={dedupedQuotes}
diff --git a/web/src/components/search/results/QuotesSection.tsx b/web/src/components/search/results/QuotesSection.tsx
index 4736e6eb7dd6..bf49f252e1ed 100644
--- a/web/src/components/search/results/QuotesSection.tsx
+++ b/web/src/components/search/results/QuotesSection.tsx
@@ -73,10 +73,6 @@ const QuotesHeader = ({ quotes, isFetching }: QuotesSectionProps) => {
     return <>Extracting quotes...</>;
   }
 
-  if (!quotes || quotes.length === 0) {
-    return <>No quotes found</>;
-  }
-
   return <>Quotes</>;
 };
 
@@ -86,16 +82,6 @@ const QuotesBody = ({ quotes, isFetching }: QuotesSectionProps) => {
     return <div className="h-[42px]"></div>;
   }
 
-  if (!isFetching && (!quotes || !quotes.length)) {
-    return (
-      <div className="flex">
-        <div className="text-error text-sm my-auto">
-          Did not find any exact quotes to support the above answer.
-        </div>
-      </div>
-    );
-  }
-
   return (
     <div className="flex flex-wrap gap-2">
       {quotes!.map((quoteInfo) => (