diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx
index 7bca1004ce42..a61d3c64c339 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx
@@ -197,26 +197,32 @@ const DocumentationTab = ({
{t('label.owner-plural')}
- {editOwnerPermission && domain.owners && (
- handleUpdatedOwner(updatedUser)}>
-
- }
- size="small"
- type="text"
- />
-
-
- )}
+ {editOwnerPermission &&
+ domain.owners &&
+ domain.owners.length > 0 && (
+
+ handleUpdatedOwner(updatedUser)
+ }>
+
+
+ }
+ size="small"
+ type="text"
+ />
+
+
+ )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.tsx
index 7bb9e81da9d4..19c2d12d7f06 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.tsx
@@ -15,6 +15,7 @@ import { Card, Space, Typography } from 'antd';
import React, { FC, useMemo } from 'react';
import { ReactComponent as AnnouncementIcon } from '../../../../assets/svg/announcements-v1.svg';
import { Thread } from '../../../../generated/entity/feed/thread';
+import RichTextEditorPreviewerV1 from '../../RichTextEditor/RichTextEditorPreviewerV1';
import './AnnouncementCard.less';
interface Props {
@@ -50,12 +51,12 @@ const AnnouncementCard: FC = ({ onClick, announcement }) => {
{message && (
-
- {message}
-
+
)}
);