diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
index 62daad7df..0a1d585e1 100644
--- a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
+++ b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -701,7 +701,7 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
       const messageId = data.params[QueryParamKey.Message];
 
       if(discussionItemId) {
-        const feedItem = allFeedItems.find((item) => (item as FeedItemFollowLayoutItem)?.feedItem?.data.id === discussionItemId);
+        const feedItem = allFeedItems.find((item) => (item as FeedItemFollowLayoutItem)?.feedItem?.data.id === discussionItemId || (item as FeedItemFollowLayoutItem)?.feedItem?.id === itemId);
         const feedItemId = feedItem?.itemId;
         if(feedItemId) {
           handleFeedItemClick(feedItemId, {