diff --git a/packages/react/src/primitives/message/MessageContent.tsx b/packages/react/src/primitives/message/MessageContent.tsx
index f3b721026..52406d4d6 100644
--- a/packages/react/src/primitives/message/MessageContent.tsx
+++ b/packages/react/src/primitives/message/MessageContent.tsx
@@ -75,7 +75,7 @@ type MessageContentPartComponentProps = {
 const MessageContentPartComponent: FC<MessageContentPartComponentProps> = ({
   components: {
     Text = defaultComponents.Text,
-    Empty = Text,
+    Empty,
     Image = defaultComponents.Image,
     UI = defaultComponents.UI,
     tools: { by_name = {}, Fallback = undefined } = {},
@@ -93,7 +93,9 @@ const MessageContentPartComponent: FC<MessageContentPartComponentProps> = ({
     case "text":
       if (status.type === "requires-action")
         throw new Error("Encountered unexpected requires-action status");
-      if (part === EMPTY_CONTENT) return <Empty part={part} status={status} />;
+      if (part === EMPTY_CONTENT && !!Empty) {
+        return <Empty status={status} />;
+      }
 
       return <Text part={part} status={status} />;