diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1New.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1New.component.tsx
index 1d1e1056121..df4bfd61343 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1New.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1New.component.tsx
@@ -112,7 +112,7 @@ const ActivityFeedListV1New = ({
       isFullWidth,
     ]
   );
-  if (isLoading && isForFeedTab) {
+  if (isLoading) {
     return <Loader />;
   }
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedPanel/feed-panel-body-v1.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedPanel/feed-panel-body-v1.less
index 7a8ba7d3913..128c766381b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedPanel/feed-panel-body-v1.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedPanel/feed-panel-body-v1.less
@@ -66,9 +66,9 @@
 .task-feed-card-v1-new {
   .header-link {
     word-wrap: break-word;
-    white-space: normal;
     color: @blue-9;
     font-weight: 600;
+    display: inline;
   }
 }
 .feeds-widget-container {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx
index 98ecf7e0036..d5748dd3e94 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx
@@ -13,6 +13,7 @@
 import { Button, Dropdown, Menu, Segmented, Space, Typography } from 'antd';
 import { AxiosError } from 'axios';
 import classNames from 'classnames';
+import { isEmpty } from 'lodash';
 import {
   default as React,
   RefObject,
@@ -115,6 +116,7 @@ export const ActivityFeedTab = ({
     loading: false,
     data: FEED_COUNT_INITIAL_DATA,
   });
+  const [isFirstLoad, setIsFirstLoad] = useState<boolean>(true);
 
   const {
     selectedThread,
@@ -150,8 +152,12 @@ export const ActivityFeedTab = ({
     () => activeTab === ActivityFeedTabs.MENTIONS,
     [activeTab]
   );
+  useEffect(() => {
+    setIsFirstLoad(true);
+  }, [subTab]);
 
   const handleTabChange = (subTab: string) => {
+    setIsFirstLoad(true);
     history.push(
       entityUtilClassBase.getEntityLink(
         entityType,
@@ -256,6 +262,7 @@ export const ActivityFeedTab = ({
 
   const handleFeedFetchFromFeedList = useCallback(
     (after?: string) => {
+      setIsFirstLoad(false);
       getFeedData(feedFilter, after, threadType, entityType, fqn, taskFilter);
     },
     [threadType, feedFilter, entityType, fqn, taskFilter, getFeedData]
@@ -611,14 +618,14 @@ export const ActivityFeedTab = ({
           handlePanelResize={handlePanelResize}
           isForFeedTab={false}
           isFullWidth={isFullWidth}
-          isLoading={loading}
+          isLoading={isFirstLoad && loading}
           selectedThread={selectedThread}
           showThread={false}
           onAfterClose={handleAfterTaskClose}
           onFeedClick={handleFeedClick}
         />
-        {loader}
-        {entityThread.length > 0 && (
+        {!isFirstLoad && loader}
+        {!isEmpty(entityThread) && !loading && (
           <div
             className="w-full"
             data-testid="observer-element"
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/activity-feed-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/activity-feed-tab.less
index 6ae2cf6c3a3..81260635a4f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/activity-feed-tab.less
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/activity-feed-tab.less
@@ -214,7 +214,6 @@
 
   .header-link {
     word-wrap: break-word;
-    white-space: normal;
     font-weight: 600;
 
     .ant-typography,
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
index 2fa0a2783cc..11765eec5a8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTabNew.component.tsx
@@ -327,12 +327,12 @@ export const TaskTabNew = ({
             {taskColumnName}
 
             <Typography.Text
-              className="break-all text-sm entity-link header-link"
+              className="break-all text-sm entity-link header-link whitespace-normal"
               data-testid="entity-link">
               {getNameFromFQN(entityFQN)}
             </Typography.Text>
 
-            <Typography.Text className="p-l-xss entity-type header-link">{`(${entityType})`}</Typography.Text>
+            <Typography.Text className="p-l-xss entity-type header-link whitespace-normal">{`(${entityType})`}</Typography.Text>
           </Button>
         </EntityPopOverCard>
       ) : null,