diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.interface.ts
index 8d26963afb5..041e3895254 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.interface.ts
@@ -28,6 +28,7 @@ export interface ActivityFeedListProp extends HTMLAttributes<HTMLDivElement> {
   hideFeedFilter?: boolean;
   hideThreadFilter?: boolean;
   refreshFeedCount?: number;
+  appliedFeedFilter?: FeedFilter;
   stickyFilter?: boolean;
   onRefreshFeeds?: () => void;
   postFeedHandler?: (value: string, id: string) => void;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx
index fea73f26b85..86163d79c32 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx
@@ -42,6 +42,7 @@ import FeedListSeparator from './FeedListSeparator';
 const ActivityFeedList: FC<ActivityFeedListProp> = ({
   className,
   feedList,
+  appliedFeedFilter,
   refreshFeedCount,
   onRefreshFeeds,
   withSidePanel = false,
@@ -69,7 +70,7 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
   const [fieldListVisible, setFieldListVisible] = useState<boolean>(false);
   const [showThreadTypeList, setShowThreadTypeList] = useState<boolean>(false);
   const [feedFilter, setFeedFilter] = useState<FeedFilter>(
-    isEntityFeed ? FeedFilter.ALL : FeedFilter.OWNER
+    isEntityFeed ? FeedFilter.ALL : appliedFeedFilter ?? FeedFilter.OWNER
   );
   const [threadType, setThreadType] = useState<ThreadType>();
 
@@ -77,7 +78,7 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
     (_e: React.MouseEvent<HTMLElement, MouseEvent>, value?: string) => {
       const feedType =
         (value as FeedFilter) ||
-        (isEntityFeed ? FeedFilter.ALL : FeedFilter.OWNER);
+        (isEntityFeed ? FeedFilter.ALL : appliedFeedFilter ?? FeedFilter.OWNER);
 
       setFeedFilter(feedType);
       setFieldListVisible(false);
@@ -238,12 +239,19 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
     };
   }, []);
 
+  const showFilterDropdowns = useMemo(
+    () =>
+      feedList.length !== 0 ||
+      feedFilter !== FeedFilter.ALL ||
+      threadType ||
+      isFeedLoading,
+    [feedList, feedFilter, threadType, isFeedLoading]
+  );
+
   return (
     <div className={classNames(className, 'feed-list-container')} id="feedData">
       <div className={stickyFilter ? 'filters-wrapper' : ''}>
-        {feedList.length === 0 && feedFilter === FeedFilter.OWNER && !threadType
-          ? null
-          : getFilterDropDown()}
+        {showFilterDropdowns && getFilterDropDown()}
       </div>
       {refreshFeedCount ? (
         <div className="tw-py-px tw-pt-3 tw-pb-3">
@@ -297,12 +305,12 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
         </>
       ) : (
         !isFeedLoading && (
-          <div className="h-min-50" data-testid="no-data-placeholder-container">
+          <div data-testid="no-data-placeholder-container">
             {entityName && feedFilter === FeedFilter.ALL && !threadType ? (
               <NoFeedPlaceholder entityName={entityName} />
             ) : !refreshFeedCount ? (
               <ErrorPlaceHolder>
-                {t('message.no-data-available-for-selected-filter')}
+                {t('message.no-feed-available-for-selected-filter')}
               </ErrorPlaceHolder>
             ) : null}
           </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx
index 0f57cfd0066..9002a39e28c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx
@@ -14,7 +14,6 @@
 import { Card } from 'antd';
 import { observer } from 'mobx-react';
 import React, {
-  Fragment,
   RefObject,
   useCallback,
   useEffect,
@@ -218,21 +217,31 @@ const MyData: React.FC<MyDataProps> = ({
 
   // Check if feedFilter or ThreadType filter is applied or not
   const filtersApplied = useMemo(
-    () => feedFilter === FeedFilter.OWNER && !threadType,
+    () => feedFilter === FeedFilter.ALL && !threadType,
     [feedFilter, threadType]
   );
 
+  const showActivityFeedList = useMemo(
+    () =>
+      feedData?.length > 0 ||
+      !filtersApplied ||
+      newFeedsLength ||
+      isFeedLoading,
+    [feedData, filtersApplied, newFeedsLength, isFeedLoading]
+  );
+
   return (
     <PageLayoutV1 leftPanel={getLeftPanel()} rightPanel={getRightPanel()}>
       {error ? (
         <ErrorPlaceHolderES errorMessage={error} type="error" />
       ) : (
-        <Fragment>
-          {feedData?.length > 0 || !filtersApplied || newFeedsLength ? (
+        <>
+          {showActivityFeedList ? (
             <>
               <ActivityFeedList
                 stickyFilter
                 withSidePanel
+                appliedFeedFilter={feedFilter}
                 deletePostHandler={deletePostHandler}
                 feedList={feedData}
                 isFeedLoading={isFeedLoading}
@@ -255,7 +264,7 @@ const MyData: React.FC<MyDataProps> = ({
           />
           {/* Add spacer to work infinite scroll smoothly */}
           <div className="tw-p-4" />
-        </Fragment>
+        </>
       )}
     </PageLayoutV1>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
index 5b917760c1a..0421a187371 100644
--- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
+++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
@@ -722,13 +722,13 @@
     "no-announcement-message": "No Announcements, Click on add announcement to add one.",
     "no-closed-task": "No Closed Tasks",
     "no-data-available": "No data available.",
-    "no-data-available-for-selected-filter": "No data found. Try changing the filters.",
     "no-entity-activity-message": "There is no activity on the {{entity}} yet. Start a conversation by clicking on the",
     "no-entity-available-with-name": "No {{entity}} available with name",
     "no-entity-data-available": "No {{entity}} data available.",
     "no-entity-found-for-name": "No {{entity}} found for {{name}}",
     "no-execution-runs-found": "No execution runs found for the pipeline.",
     "no-features-data-available": "No features data available",
+    "no-feed-available-for-selected-filter": "No feed found. Try changing the filters.",
     "no-ingestion-available": "No ingestion data available",
     "no-ingestion-description": "To view Ingestion Data, run the metadata ingestion. Please refer to this doc to schedule the",
     "no-inherited-roles-found": "No inherited roles found",