diff --git a/workbench-app/src/components/Conversations/InteractHistory.tsx b/workbench-app/src/components/Conversations/InteractHistory.tsx
index 04c78028..288c0ac4 100644
--- a/workbench-app/src/components/Conversations/InteractHistory.tsx
+++ b/workbench-app/src/components/Conversations/InteractHistory.tsx
@@ -170,7 +170,11 @@ export const InteractHistory: React.FC<InteractHistoryProps> = (props) => {
                     lastDate = date;
                 }
 
-                if (message.messageType === 'chat' && message.sender.participantRole !== 'user') {
+                if (
+                    message.messageType === 'chat' &&
+                    message.sender.participantRole !== 'user' &&
+                    message.metadata?.generated_content !== false
+                ) {
                     generatedResponseCount += 1;
                 }
 
diff --git a/workbench-app/src/components/Conversations/Message/InteractMessage.tsx b/workbench-app/src/components/Conversations/Message/InteractMessage.tsx
index c8d0f031..97e24d3e 100644
--- a/workbench-app/src/components/Conversations/Message/InteractMessage.tsx
+++ b/workbench-app/src/components/Conversations/Message/InteractMessage.tsx
@@ -1,5 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+import { MessageBase } from './MessageBase';
+
 import { CopilotMessageV2, Timestamp, UserMessageV2 } from '@fluentui-copilot/react-copilot';
 import { Divider, makeStyles, mergeClasses, shorthands, tokens } from '@fluentui/react-components';
 import React from 'react';
@@ -155,13 +157,15 @@ export const InteractMessage: React.FC<InteractMessageProps> = (props) => {
                 {body}
                 <ToolCalls message={message} />
             </CopilotMessageV2>
-        ) : (
+        ) : message.messageType === 'chat' ? (
             <div className={classes.user}>
                 {header}
                 <UserMessageV2 className={classes.userContent}>{body}</UserMessageV2>
                 {actions}
                 {footer}
             </div>
+        ) : (
+            <MessageBase className={classes.note} header={header} body={body} footer={footer} />
         );
 
     return (