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 8a517679c63..b306e8f109f 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
@@ -272,7 +272,7 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
         <Fragment>
           {entityName && feedFilter === FeedFilter.ALL && !threadType ? (
             <NoFeedPlaceholder entityName={entityName} />
-          ) : (
+          ) : !refreshFeedCount ? (
             <Fragment>
               <FeedListSeparator
                 className="tw-relative tw-mt-1 tw-mb-3.5 tw-pb-5"
@@ -280,7 +280,7 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
               />
               <>No conversations found. Try changing the filter.</>
             </Fragment>
-          )}
+          ) : null}
         </Fragment>
       )}
       {confirmationState.state && (
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 62443ff8b6a..ce7a113dd61 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
@@ -18,6 +18,7 @@ import React, {
   RefObject,
   useCallback,
   useEffect,
+  useMemo,
   useRef,
   useState,
 } from 'react';
@@ -227,26 +228,33 @@ const MyData: React.FC<MyDataProps> = ({
 
   const newFeedsLength = activityFeeds && activityFeeds.length;
 
+  // Check if feedFilter or ThreadType filter is applied or not
+  const filtersApplied = useMemo(
+    () => feedFilter === FeedFilter.ALL && !threadType,
+    [feedFilter, threadType]
+  );
+
   return (
     <PageLayout leftPanel={getLeftPanel()} rightPanel={getRightPanel()}>
       {error ? (
         <ErrorPlaceHolderES errorMessage={error} type="error" />
       ) : (
         <Fragment>
-          {feedData?.length > 0 ||
-          feedFilter !== FeedFilter.ALL ||
-          threadType ? (
-            <ActivityFeedList
-              withSidePanel
-              className=""
-              deletePostHandler={deletePostHandler}
-              feedList={feedData}
-              postFeedHandler={postFeedHandler}
-              refreshFeedCount={newFeedsLength}
-              updateThreadHandler={updateThreadHandler}
-              onFeedFiltersUpdate={handleFeedFilterChange}
-              onRefreshFeeds={onRefreshFeeds}
-            />
+          {feedData?.length > 0 || !filtersApplied || newFeedsLength ? (
+            <>
+              <ActivityFeedList
+                withSidePanel
+                className="tw-mt-3"
+                deletePostHandler={deletePostHandler}
+                feedList={feedData}
+                postFeedHandler={postFeedHandler}
+                refreshFeedCount={newFeedsLength}
+                updateThreadHandler={updateThreadHandler}
+                onFeedFiltersUpdate={handleFeedFilterChange}
+                onRefreshFeeds={onRefreshFeeds}
+              />
+              {filtersApplied && feedData?.length <= 0 ? <Onboarding /> : null}
+            </>
           ) : (
             !isFeedLoading && <Onboarding />
           )}