diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
index 87a5ebb7..c81e46ef 100644
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -95,12 +95,13 @@ export default function Conversation() {
         ></ConversationBubble>
       );
     } else if (query.response) {
+      const trimmedResponse = query.response.trim();
       responseView = (
         <ConversationBubble
           ref={endMessageRef}
           className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'}`}
           key={`${index}ANSWER`}
-          message={query.response}
+          message={trimmedResponse.length > 0 ? trimmedResponse : 'No answer found.x'}
           type={'ANSWER'}
           sources={query.sources}
           feedback={query.feedback}