diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
index 6abd62696cb9..4ea4d8eb39b9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
@@ -75,12 +75,24 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
   }>();
 
   const { domains, dataProducts, id: entityId } = data ?? {};
-
+ const hasClassificationTags = selectedTags.some(
+    (tag) => tag.source === TagSource.Classification
+  );
+  const hasGlossaryTags = selectedTags.some(
+    (tag) => tag.source === TagSource.Glossary
+  );
+ 
+  const shouldShowTags = editTagPermission || hasClassificationTags;
+  const shouldShowGlossaryTerms =
+    editGlossaryTermsPermission || hasGlossaryTags;
+  const shouldShowDataProducts =
+    showDataProductContainer &&
+    (editDataProductPermission || Boolean(dataProducts?.length));
   return (
     <>
       {beforeSlot}
       <Space className="w-full" direction="vertical" size="large">
-        {showDataProductContainer && (
+        {shouldShowDataProducts && (
           <div data-testid="KnowledgePanel.DataProducts">
             <DataProductsContainer
               newLook
@@ -92,7 +104,7 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
             />
           </div>
         )}
-
+        {shouldShowTags && (
         <div data-testid="KnowledgePanel.Tags">
           <TagsContainerV2
             newLook
@@ -106,7 +118,8 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
             onSelectionChange={onTagSelectionChange}
           />
         </div>
-
+               )}
+     {shouldShowGlossaryTerms && (
         <div data-testid="KnowledgePanel.GlossaryTerms">
           <TagsContainerV2
             newLook
@@ -120,6 +133,7 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
             onSelectionChange={onTagSelectionChange}
           />
         </div>
+               )}
         {KnowledgeArticles && (
           <KnowledgeArticles entityId={entityId} entityType={entityType} />
         )}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
index 29b4009e3ac7..cad4dfd86d2b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
@@ -493,6 +493,10 @@ const TagsContainerV2 = ({
     setTags(getFilterTags(selectedTags));
   }, [selectedTags]);
 
+  if (newLook && !permission && isEmpty(tags?.[tagType]) && !isEditTags) {
+    return null;
+  }
+  
   if (newLook) {
     return (
       <ExpandableCard