diff --git a/src/components/CustomMessage.tsx b/src/components/CustomMessage.tsx
index 326c11d27..1b667eaf8 100644
--- a/src/components/CustomMessage.tsx
+++ b/src/components/CustomMessage.tsx
@@ -40,7 +40,10 @@ export default function CustomMessage(props: Props) {
 
   const shouldRenderFeedback = () => {
     return (
-      enableEmojiFeedback && message.myFeedbackStatus !== 'NOT_APPLICABLE' && !messageExtension.isStreaming(message)
+      enableEmojiFeedback &&
+      message.myFeedbackStatus !== 'NOT_APPLICABLE' &&
+      !messageExtension.isStreaming(message) &&
+      !messageExtension.isBotWelcomeMsg(message, botUserId ?? '')
     );
   };