diff --git a/src/pages/OldCommon/hooks/useCommonMember.ts b/src/pages/OldCommon/hooks/useCommonMember.ts
index f749b2b2e..8d01168e8 100644
--- a/src/pages/OldCommon/hooks/useCommonMember.ts
+++ b/src/pages/OldCommon/hooks/useCommonMember.ts
@@ -141,6 +141,7 @@ export const useCommonMember = (options: Options = {}): Return => {
             loading: false,
             fetched: true,
             data: {
+              commonId,
               ...commonMember,
               ...generateCirclesDataForCommonMember(
                 governance.circles,
@@ -189,7 +190,7 @@ export const useCommonMember = (options: Options = {}): Return => {
         }
       }
     },
-    [state, userId],
+    [state, userId, commonId],
   );
 
   const setCommonMember = useCallback(
diff --git a/src/pages/OldCommon/hooks/useCommonMembers.ts b/src/pages/OldCommon/hooks/useCommonMembers.ts
index 3f16ad080..f07c8221f 100644
--- a/src/pages/OldCommon/hooks/useCommonMembers.ts
+++ b/src/pages/OldCommon/hooks/useCommonMembers.ts
@@ -141,7 +141,7 @@ export const useCommonMembers = ({ commonId }: Options): Return => {
 
               const user = cachedUserStates[commonMember.userId]?.data;
 
-              return user ? [...acc, { ...commonMember, user }] : acc;
+              return user ? [...acc, { ...commonMember, user, commonId }] : acc;
             }, []);
 
             return {
@@ -178,7 +178,7 @@ export const useCommonMembers = ({ commonId }: Options): Return => {
               ({ uid }) => uid === commonMember.userId,
             );
 
-            return user ? [...acc, { ...commonMember, user }] : acc;
+            return user ? [...acc, { ...commonMember, user, commonId }] : acc;
           }, []);
 
           return {
@@ -198,7 +198,7 @@ export const useCommonMembers = ({ commonId }: Options): Return => {
         }));
       }
     })();
-  }, [commonMembersState.data]);
+  }, [commonMembersState.data, commonId]);
 
   return {
     ...state,
diff --git a/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx b/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
index 5ae93d503..6117a8a25 100644
--- a/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
+++ b/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
@@ -78,423 +78,421 @@ interface DiscussionFeedCardProps {
   onInternalLinkClick: (data: InternalLinkData) => void;
 }
 
-const DiscussionFeedCard = forwardRef<FeedItemRef, DiscussionFeedCardProps>(
-  (props, ref) => {
-    const {
-      setChatItem,
-      feedItemIdForAutoChatOpen,
-      shouldAllowChatAutoOpen,
-      nestedItemData,
-    } = useChatContext();
-    const { notify } = useNotification();
-    const {
-      item,
-      governanceCircles,
-      isMobileVersion = false,
+function DiscussionFeedCard(props, ref) {
+  const {
+    setChatItem,
+    feedItemIdForAutoChatOpen,
+    shouldAllowChatAutoOpen,
+    nestedItemData,
+  } = useChatContext();
+  const { notify } = useNotification();
+  const {
+    item,
+    governanceCircles,
+    isMobileVersion = false,
+    commonId,
+    commonName,
+    commonImage,
+    commonNotion: outerCommonNotion,
+    pinnedFeedItems,
+    commonMember,
+    isProject,
+    isPinned,
+    isPreviewMode,
+    isActive,
+    isExpanded,
+    getLastMessage,
+    getNonAllowedItems,
+    onActiveItemDataChange,
+    directParent,
+    rootCommonId,
+    feedItemFollow,
+    shouldPreLoadMessages,
+    withoutMenu,
+    onUserClick,
+    onFeedItemClick,
+    onInternalLinkClick,
+  } = props;
+  const {
+    isShowing: isReportModalOpen,
+    onOpen: onReportModalOpen,
+    onClose: onReportModalClose,
+  } = useModal(false);
+  const {
+    isShowing: isShareModalOpen,
+    onOpen: onShareModalOpen,
+    onClose: onShareModalClose,
+  } = useModal(false);
+  const {
+    isShowing: isDeleteModalOpen,
+    onOpen: onDeleteModalOpen,
+    onClose: onDeleteModalClose,
+  } = useModal(false);
+  const {
+    isShowing: isLinkStreamModalOpen,
+    onOpen: onLinkStreamModalOpen,
+    onClose: onLinkStreamModalClose,
+  } = useModal(false);
+  const {
+    isShowing: isUnlinkStreamModalOpen,
+    onOpen: onUnlinkStreamModalOpen,
+    onClose: onUnlinkStreamModalClose,
+  } = useModal(false);
+  const {
+    isShowing: isMoveStreamModalOpen,
+    onOpen: onMoveStreamModalOpen,
+    onClose: onMoveStreamModalClose,
+  } = useModal(false);
+  const [isDeletingInProgress, setDeletingInProgress] = useState(false);
+  const {
+    fetchUser: fetchDiscussionCreator,
+    data: discussionCreator,
+    fetched: isDiscussionCreatorFetched,
+  } = useUserById();
+  const {
+    fetchDiscussion,
+    data: discussion,
+    fetched: isDiscussionFetched,
+  } = useDiscussionById();
+  const isHome = discussion?.predefinedType === PredefinedTypes.General;
+  const discussionNotion = commonId
+    ? discussion?.notionByCommon?.[commonId]
+    : undefined;
+  const {
+    data: feedItemUserMetadata,
+    fetched: isFeedItemUserMetadataFetched,
+    fetchFeedItemUserMetadata,
+  } = useFeedItemUserMetadata();
+  const shouldLoadCommonData =
+    isHome || (discussionNotion && !outerCommonNotion);
+  const { data: common } = useCommon(shouldLoadCommonData ? commonId : "");
+  const preloadDiscussionMessagesData = usePreloadDiscussionMessagesById({
+    commonId,
+    discussionId: discussion?.id,
+    onUserClick,
+    onFeedItemClick,
+    onInternalLinkClick,
+  });
+  const { markFeedItemAsSeen, markFeedItemAsUnseen } =
+    useUpdateFeedItemSeenState();
+  const menuItems = useMenuItems(
+    {
       commonId,
-      commonName,
-      commonImage,
-      commonNotion: outerCommonNotion,
       pinnedFeedItems,
+      feedItem: item,
+      discussion,
+      governanceCircles,
       commonMember,
-      isProject,
-      isPinned,
-      isPreviewMode,
-      isActive,
-      isExpanded,
-      getLastMessage,
-      getNonAllowedItems,
-      onActiveItemDataChange,
-      directParent,
-      rootCommonId,
       feedItemFollow,
-      shouldPreLoadMessages,
+      getNonAllowedItems,
+      feedItemUserMetadata,
       withoutMenu,
-      onUserClick,
-      onFeedItemClick,
-      onInternalLinkClick,
-    } = props;
-    const {
-      isShowing: isReportModalOpen,
-      onOpen: onReportModalOpen,
-      onClose: onReportModalClose,
-    } = useModal(false);
-    const {
-      isShowing: isShareModalOpen,
-      onOpen: onShareModalOpen,
-      onClose: onShareModalClose,
-    } = useModal(false);
-    const {
-      isShowing: isDeleteModalOpen,
-      onOpen: onDeleteModalOpen,
-      onClose: onDeleteModalClose,
-    } = useModal(false);
-    const {
-      isShowing: isLinkStreamModalOpen,
-      onOpen: onLinkStreamModalOpen,
-      onClose: onLinkStreamModalClose,
-    } = useModal(false);
-    const {
-      isShowing: isUnlinkStreamModalOpen,
-      onOpen: onUnlinkStreamModalOpen,
-      onClose: onUnlinkStreamModalClose,
-    } = useModal(false);
-    const {
-      isShowing: isMoveStreamModalOpen,
-      onOpen: onMoveStreamModalOpen,
-      onClose: onMoveStreamModalClose,
-    } = useModal(false);
-    const [isDeletingInProgress, setDeletingInProgress] = useState(false);
-    const {
-      fetchUser: fetchDiscussionCreator,
-      data: discussionCreator,
-      fetched: isDiscussionCreatorFetched,
-    } = useUserById();
-    const {
-      fetchDiscussion,
-      data: discussion,
-      fetched: isDiscussionFetched,
-    } = useDiscussionById();
-    const isHome = discussion?.predefinedType === PredefinedTypes.General;
-    const discussionNotion = commonId
-      ? discussion?.notionByCommon?.[commonId]
-      : undefined;
-    const {
-      data: feedItemUserMetadata,
-      fetched: isFeedItemUserMetadataFetched,
-      fetchFeedItemUserMetadata,
-    } = useFeedItemUserMetadata();
-    const shouldLoadCommonData =
-      isHome || (discussionNotion && !outerCommonNotion);
-    const { data: common } = useCommon(shouldLoadCommonData ? commonId : "");
-    const preloadDiscussionMessagesData = usePreloadDiscussionMessagesById({
-      commonId,
-      discussionId: discussion?.id,
-      onUserClick,
-      onFeedItemClick,
-      onInternalLinkClick,
-    });
-    const { markFeedItemAsSeen, markFeedItemAsUnseen } =
-      useUpdateFeedItemSeenState();
-    const menuItems = useMenuItems(
-      {
-        commonId,
-        pinnedFeedItems,
-        feedItem: item,
-        discussion,
-        governanceCircles,
-        commonMember,
-        feedItemFollow,
-        getNonAllowedItems,
-        feedItemUserMetadata,
-        withoutMenu,
-      },
-      {
-        report: onReportModalOpen,
-        share: () => onShareModalOpen(),
-        remove: onDeleteModalOpen,
-        linkStream: onLinkStreamModalOpen,
-        unlinkStream: onUnlinkStreamModalOpen,
-        moveStream: onMoveStreamModalOpen,
-        markFeedItemAsSeen,
-        markFeedItemAsUnseen,
-      },
-    );
-    const user = useSelector(selectUser());
-    const [isHovering, setHovering] = useState(false);
-    const onHover = (isMouseEnter: boolean): void => {
-      setHovering(isMouseEnter);
-    };
-    const userId = user?.uid;
-    const isLoading =
-      !isDiscussionCreatorFetched ||
-      !isDiscussionFetched ||
-      !isFeedItemUserMetadataFetched ||
-      !commonId;
-    const cardTitle = discussion?.title;
-    const commonNotion = outerCommonNotion ?? common?.notion;
+    },
+    {
+      report: onReportModalOpen,
+      share: () => onShareModalOpen(),
+      remove: onDeleteModalOpen,
+      linkStream: onLinkStreamModalOpen,
+      unlinkStream: onUnlinkStreamModalOpen,
+      moveStream: onMoveStreamModalOpen,
+      markFeedItemAsSeen,
+      markFeedItemAsUnseen,
+    },
+  );
+  const user = useSelector(selectUser());
+  const [isHovering, setHovering] = useState(false);
+  const onHover = (isMouseEnter: boolean): void => {
+    setHovering(isMouseEnter);
+  };
+  const userId = user?.uid;
+  const isLoading =
+    !isDiscussionCreatorFetched ||
+    !isDiscussionFetched ||
+    !isFeedItemUserMetadataFetched ||
+    !commonId;
+  const cardTitle = discussion?.title;
+  const commonNotion = outerCommonNotion ?? common?.notion;
 
-    const handleOpenChat = useCallback(() => {
-      if (discussion && !isPreviewMode) {
-        setChatItem({
-          feedItemId: item.id,
-          discussion,
-          circleVisibility: item.circleVisibility,
-          lastSeenItem: feedItemUserMetadata?.lastSeen,
-          lastSeenAt: feedItemUserMetadata?.lastSeenAt,
-          count: feedItemUserMetadata?.count,
-          seenOnce: feedItemUserMetadata?.seenOnce,
-          seen: feedItemUserMetadata?.seen,
-          hasUnseenMention: feedItemUserMetadata?.hasUnseenMention,
-          nestedItemData: nestedItemData && {
-            ...nestedItemData,
-            feedItem: {
-              type: InboxItemType.FeedItemFollow,
-              itemId: item.id,
-              feedItem: item,
-            },
+  const handleOpenChat = useCallback(() => {
+    if (discussion && !isPreviewMode) {
+      setChatItem({
+        feedItemId: item.id,
+        discussion,
+        circleVisibility: item.circleVisibility,
+        lastSeenItem: feedItemUserMetadata?.lastSeen,
+        lastSeenAt: feedItemUserMetadata?.lastSeenAt,
+        count: feedItemUserMetadata?.count,
+        seenOnce: feedItemUserMetadata?.seenOnce,
+        seen: feedItemUserMetadata?.seen,
+        hasUnseenMention: feedItemUserMetadata?.hasUnseenMention,
+        nestedItemData: nestedItemData && {
+          ...nestedItemData,
+          feedItem: {
+            type: InboxItemType.FeedItemFollow,
+            itemId: item.id,
+            feedItem: item,
           },
-        });
-      }
-    }, [
-      discussion,
-      item.id,
-      item.circleVisibility,
-      feedItemUserMetadata?.lastSeen,
-      feedItemUserMetadata?.lastSeenAt,
-      feedItemUserMetadata?.count,
-      feedItemUserMetadata?.seenOnce,
-      feedItemUserMetadata?.seen,
-      feedItemUserMetadata?.hasUnseenMention,
-      nestedItemData,
-      isPreviewMode,
-    ]);
+        },
+      });
+    }
+  }, [
+    discussion,
+    item.id,
+    item.circleVisibility,
+    feedItemUserMetadata?.lastSeen,
+    feedItemUserMetadata?.lastSeenAt,
+    feedItemUserMetadata?.count,
+    feedItemUserMetadata?.seenOnce,
+    feedItemUserMetadata?.seen,
+    feedItemUserMetadata?.hasUnseenMention,
+    nestedItemData,
+    isPreviewMode,
+  ]);
 
-    const onDiscussionDelete = useCallback(async () => {
-      try {
-        if (discussion) {
-          setDeletingInProgress(true);
-          await DiscussionService.deleteDiscussion(discussion.id);
-          onDeleteModalClose();
-        }
-      } catch {
-        notify("Something went wrong");
-      } finally {
-        setDeletingInProgress(false);
+  const onDiscussionDelete = useCallback(async () => {
+    try {
+      if (discussion) {
+        setDeletingInProgress(true);
+        await DiscussionService.deleteDiscussion(discussion.id);
+        onDeleteModalClose();
       }
-    }, [discussion]);
+    } catch {
+      notify("Something went wrong");
+    } finally {
+      setDeletingInProgress(false);
+    }
+  }, [discussion]);
 
-    const preloadDiscussionMessages = useMemo(
-      () =>
-        debounce<
-          typeof preloadDiscussionMessagesData.preloadDiscussionMessages
-        >(
-          (...args) =>
-            preloadDiscussionMessagesData.preloadDiscussionMessages(...args),
-          6000,
-        ),
-      [preloadDiscussionMessagesData.preloadDiscussionMessages],
-    );
+  const preloadDiscussionMessages = useMemo(
+    () =>
+      debounce<typeof preloadDiscussionMessagesData.preloadDiscussionMessages>(
+        (...args) =>
+          preloadDiscussionMessagesData.preloadDiscussionMessages(...args),
+        6000,
+      ),
+    [preloadDiscussionMessagesData.preloadDiscussionMessages],
+  );
 
-    useEffect(() => {
-      fetchDiscussionCreator(item.userId);
-    }, [item.userId]);
+  useEffect(() => {
+    fetchDiscussionCreator(item.userId);
+  }, [item.userId]);
 
-    useEffect(() => {
-      fetchDiscussion(item.data.id);
-    }, [item.data.id]);
+  useEffect(() => {
+    fetchDiscussion(item.data.id);
+  }, [item.data.id]);
 
-    useEffect(() => {
-      if (commonId) {
-        fetchFeedItemUserMetadata({
-          userId: userId || "",
-          commonId,
-          feedObjectId: item.id,
-        });
-      }
-    }, [userId, commonId, item.id]);
+  useEffect(() => {
+    if (commonId) {
+      fetchFeedItemUserMetadata({
+        userId: userId || "",
+        commonId,
+        feedObjectId: item.id,
+      });
+    }
+  }, [userId, commonId, item.id]);
 
-    useEffect(() => {
-      if (
-        (!isActive ||
-          shouldAllowChatAutoOpen === null ||
-          shouldAllowChatAutoOpen) &&
-        isDiscussionFetched &&
-        isFeedItemUserMetadataFetched &&
-        item.id === feedItemIdForAutoChatOpen &&
-        !isMobileVersion
-      ) {
-        handleOpenChat();
-      }
-    }, [
-      isDiscussionFetched,
-      isFeedItemUserMetadataFetched,
-      shouldAllowChatAutoOpen,
-    ]);
+  useEffect(() => {
+    if (
+      (!isActive ||
+        shouldAllowChatAutoOpen === null ||
+        shouldAllowChatAutoOpen) &&
+      isDiscussionFetched &&
+      isFeedItemUserMetadataFetched &&
+      item.id === feedItemIdForAutoChatOpen &&
+      !isMobileVersion
+    ) {
+      handleOpenChat();
+    }
+  }, [
+    isDiscussionFetched,
+    isFeedItemUserMetadataFetched,
+    shouldAllowChatAutoOpen,
+  ]);
 
-    useEffect(() => {
-      if (isActive && shouldAllowChatAutoOpen !== null) {
-        handleOpenChat();
-      }
-    }, [isActive, shouldAllowChatAutoOpen, handleOpenChat]);
+  useEffect(() => {
+    if (isActive && shouldAllowChatAutoOpen !== null) {
+      handleOpenChat();
+    }
+  }, [isActive, shouldAllowChatAutoOpen, handleOpenChat]);
 
-    useEffect(() => {
-      if (isActive && cardTitle) {
-        onActiveItemDataChange?.({
-          itemId: item.id,
-          title: cardTitle,
-        });
-      }
-    }, [isActive, cardTitle]);
+  useEffect(() => {
+    if (isActive && cardTitle) {
+      onActiveItemDataChange?.({
+        itemId: item.id,
+        title: cardTitle,
+      });
+    }
+  }, [isActive, cardTitle]);
 
-    useEffect(() => {
-      if (
-        shouldPreLoadMessages &&
-        !isActive &&
-        commonId &&
-        item.circleVisibility
-      ) {
-        preloadDiscussionMessages(item.circleVisibility);
-      }
-    }, [shouldPreLoadMessages, isActive]);
+  useEffect(() => {
+    if (
+      shouldPreLoadMessages &&
+      !isActive &&
+      commonId &&
+      item.circleVisibility
+    ) {
+      preloadDiscussionMessages(item.circleVisibility);
+    }
+  }, [shouldPreLoadMessages, isActive]);
 
-    useUpdateEffect(() => {
-      if (
-        shouldPreLoadMessages &&
-        !isActive &&
-        commonId &&
-        item.circleVisibility
-      ) {
-        preloadDiscussionMessages(item.circleVisibility, true);
-      }
-    }, [item.data.lastMessage?.content]);
+  useUpdateEffect(() => {
+    if (
+      shouldPreLoadMessages &&
+      !isActive &&
+      commonId &&
+      item.circleVisibility
+    ) {
+      preloadDiscussionMessages(item.circleVisibility, true);
+    }
+  }, [item.data.lastMessage?.content]);
 
-    const lastMessage = useMemo(() => {
-      return getLastMessage({
-        commonFeedType: item.data.type,
-        lastMessage: item.data.lastMessage,
-        discussion,
-        currentUserId: userId,
-        feedItemCreatorName: getUserName(discussionCreator),
-        commonName,
-        isProject,
-        hasFiles: item.data.hasFiles,
-        hasImages: item.data.hasImages,
-      });
-    }, [
-      item.data.type,
-      item.data.lastMessage,
+  const lastMessage = useMemo(() => {
+    return getLastMessage({
+      commonFeedType: item.data.type,
+      lastMessage: item.data.lastMessage,
       discussion,
-      userId,
-      discussionCreator,
+      currentUserId: userId,
+      feedItemCreatorName: getUserName(discussionCreator),
       commonName,
       isProject,
-      item.data.hasFiles,
-      item.data.hasImages,
-    ]);
+      hasFiles: item.data.hasFiles,
+      hasImages: item.data.hasImages,
+    });
+  }, [
+    item.data.type,
+    item.data.lastMessage,
+    discussion,
+    userId,
+    discussionCreator,
+    commonName,
+    isProject,
+    item.data.hasFiles,
+    item.data.hasImages,
+  ]);
 
-    return (
-      <>
-        <FeedCard
-          ref={ref}
-          feedItemId={item.id}
-          isHovering={isHovering}
-          lastActivity={item.updatedAt.seconds * 1000}
-          unreadMessages={feedItemUserMetadata?.count || 0}
-          isActive={isActive}
-          isExpanded={isExpanded}
-          onClick={handleOpenChat}
-          title={cardTitle}
-          lastMessage={lastMessage}
-          isPreviewMode={isPreviewMode}
-          isPinned={isPinned}
-          commonName={commonName}
-          commonId={commonId}
-          image={commonImage}
-          imageAlt={`${commonName}'s image`}
-          isProject={isProject}
-          isFollowing={feedItemFollow.isFollowing}
-          isLoading={isLoading}
-          menuItems={menuItems}
-          seenOnce={
-            feedItemUserMetadata?.seenOnce ?? !isFeedItemUserMetadataFetched
-          }
-          seen={feedItemUserMetadata?.seen ?? !isFeedItemUserMetadataFetched}
-          ownerId={item.userId}
-          discussionPredefinedType={discussion?.predefinedType}
-          notion={discussionNotion && commonNotion}
-          hasUnseenMention={
-            isFeedItemUserMetadataFetched &&
-            feedItemUserMetadata?.hasUnseenMention
-          }
-          originalCommonIdForLinking={discussion?.commonId}
-          linkedCommonIds={discussion?.linkedCommonIds}
-        >
-          {(isExpanded || isActive) && (
-            <DiscussionFeedCardContent
-              item={item}
-              governanceCircles={governanceCircles}
-              isMobileVersion={isMobileVersion}
-              commonId={commonId}
-              directParent={directParent}
-              onUserSelect={onUserClick && (() => onUserClick(item.userId))}
-              discussionCreator={discussionCreator}
-              isHome={isHome}
-              menuItems={menuItems}
-              discussion={discussion}
-              common={common}
-              discussionNotion={discussionNotion}
-              handleOpenChat={handleOpenChat}
-              onHover={onHover}
-              isLoading={isLoading}
-            />
-          )}
-        </FeedCard>
-        {userId && discussion && (
-          <ReportModal
-            userId={userId}
-            isShowing={isReportModalOpen}
-            onClose={onReportModalClose}
-            entity={discussion}
-            type={EntityTypes.Discussion}
+  return (
+    <>
+      <FeedCard
+        ref={ref}
+        feedItemId={item.id}
+        isHovering={isHovering}
+        lastActivity={item.updatedAt.seconds * 1000}
+        unreadMessages={feedItemUserMetadata?.count || 0}
+        isActive={isActive}
+        isExpanded={isExpanded}
+        onClick={handleOpenChat}
+        title={cardTitle}
+        lastMessage={lastMessage}
+        isPreviewMode={isPreviewMode}
+        isPinned={isPinned}
+        commonName={commonName}
+        commonId={commonId}
+        image={commonImage}
+        imageAlt={`${commonName}'s image`}
+        isProject={isProject}
+        isFollowing={feedItemFollow.isFollowing}
+        isLoading={isLoading}
+        menuItems={menuItems}
+        seenOnce={
+          feedItemUserMetadata?.seenOnce ?? !isFeedItemUserMetadataFetched
+        }
+        seen={feedItemUserMetadata?.seen ?? !isFeedItemUserMetadataFetched}
+        ownerId={item.userId}
+        discussionPredefinedType={discussion?.predefinedType}
+        notion={discussionNotion && commonNotion}
+        hasUnseenMention={
+          isFeedItemUserMetadataFetched &&
+          feedItemUserMetadata?.hasUnseenMention
+        }
+        originalCommonIdForLinking={discussion?.commonId}
+        linkedCommonIds={discussion?.linkedCommonIds}
+      >
+        {(isExpanded || isActive) && (
+          <DiscussionFeedCardContent
+            item={item}
+            governanceCircles={governanceCircles}
+            isMobileVersion={isMobileVersion}
+            commonId={commonId}
+            directParent={directParent}
+            onUserSelect={onUserClick && (() => onUserClick(item.userId))}
+            discussionCreator={discussionCreator}
+            isHome={isHome}
+            menuItems={menuItems}
+            discussion={discussion}
+            common={common}
+            discussionNotion={discussionNotion}
+            handleOpenChat={handleOpenChat}
+            onHover={onHover}
+            isLoading={isLoading}
           />
         )}
-        {discussion && (
-          <FeedCardShare
-            isOpen={isShareModalOpen}
-            onClose={onShareModalClose}
-            linkType={StaticLinkType.Discussion}
-            element={discussion}
+      </FeedCard>
+      {userId && discussion && (
+        <ReportModal
+          userId={userId}
+          isShowing={isReportModalOpen}
+          onClose={onReportModalClose}
+          entity={discussion}
+          type={EntityTypes.Discussion}
+        />
+      )}
+      {discussion && (
+        <FeedCardShare
+          isOpen={isShareModalOpen}
+          onClose={onShareModalClose}
+          linkType={StaticLinkType.Discussion}
+          element={discussion}
+          feedItemId={item.id}
+        />
+      )}
+      {isDeleteModalOpen && (
+        <GlobalOverlay>
+          <DeletePrompt
+            title="Are you sure you want to delete this discussion?"
+            description="Note that this action could not be undone."
+            onCancel={onDeleteModalClose}
+            onDelete={onDiscussionDelete}
+            isDeletingInProgress={isDeletingInProgress}
+          />
+        </GlobalOverlay>
+      )}
+      {commonId && (
+        <>
+          <LinkStreamModal
+            isOpen={isLinkStreamModalOpen}
+            onClose={onLinkStreamModalClose}
             feedItemId={item.id}
+            title={cardTitle || ""}
+            rootCommonId={rootCommonId || commonId}
+            commonId={commonId}
+            originalCommonId={discussion?.commonId || ""}
+            linkedCommonIds={discussion?.linkedCommonIds}
+            circleVisibility={item.circleVisibility}
           />
-        )}
-        {isDeleteModalOpen && (
-          <GlobalOverlay>
-            <DeletePrompt
-              title="Are you sure you want to delete this discussion?"
-              description="Note that this action could not be undone."
-              onCancel={onDeleteModalClose}
-              onDelete={onDiscussionDelete}
-              isDeletingInProgress={isDeletingInProgress}
-            />
-          </GlobalOverlay>
-        )}
-        {commonId && (
-          <>
-            <LinkStreamModal
-              isOpen={isLinkStreamModalOpen}
-              onClose={onLinkStreamModalClose}
-              feedItemId={item.id}
-              title={cardTitle || ""}
-              rootCommonId={rootCommonId || commonId}
-              commonId={commonId}
-              originalCommonId={discussion?.commonId || ""}
-              linkedCommonIds={discussion?.linkedCommonIds}
-              circleVisibility={item.circleVisibility}
-            />
-            <UnlinkStreamModal
-              isOpen={isUnlinkStreamModalOpen}
-              onClose={onUnlinkStreamModalClose}
-              feedItemId={item.id}
-              title={cardTitle || ""}
-              commonId={commonId}
-              commonName={commonName}
-            />
-            <MoveStreamModal
-              isOpen={isMoveStreamModalOpen}
-              onClose={onMoveStreamModalClose}
-              feedItemId={item.id}
-              title={cardTitle || ""}
-              rootCommonId={rootCommonId || commonId}
-              commonId={commonId}
-              originalCommonId={discussion?.commonId || ""}
-              circleVisibility={item.circleVisibility}
-            />
-          </>
-        )}
-      </>
-    );
-  },
-);
+          <UnlinkStreamModal
+            isOpen={isUnlinkStreamModalOpen}
+            onClose={onUnlinkStreamModalClose}
+            feedItemId={item.id}
+            title={cardTitle || ""}
+            commonId={commonId}
+            commonName={commonName}
+          />
+          <MoveStreamModal
+            isOpen={isMoveStreamModalOpen}
+            onClose={onMoveStreamModalClose}
+            feedItemId={item.id}
+            title={cardTitle || ""}
+            rootCommonId={rootCommonId || commonId}
+            commonId={commonId}
+            originalCommonId={discussion?.commonId || ""}
+            circleVisibility={item.circleVisibility}
+          />
+        </>
+      )}
+    </>
+  );
+}
 
-export default DiscussionFeedCard;
+export default forwardRef<FeedItemRef, DiscussionFeedCardProps>(
+  DiscussionFeedCard,
+);
\ No newline at end of file
diff --git a/src/pages/common/components/FeedCard/FeedCard.tsx b/src/pages/common/components/FeedCard/FeedCard.tsx
index 62c018eaa..8a786f1bd 100644
--- a/src/pages/common/components/FeedCard/FeedCard.tsx
+++ b/src/pages/common/components/FeedCard/FeedCard.tsx
@@ -62,7 +62,7 @@ type FeedCardProps = PropsWithChildren<{
   linkedCommonIds?: string[];
 }>;
 
-export const FeedCard = forwardRef<FeedCardRef, FeedCardProps>((props, ref) => {
+const FeedCard = (props, ref) => {
   const {
     className,
     feedItemId,
@@ -319,4 +319,6 @@ export const FeedCard = forwardRef<FeedCardRef, FeedCardProps>((props, ref) => {
       </div>
     </div>
   );
-});
+};
+
+export default forwardRef<FeedCardRef, FeedCardProps>(FeedCard);
diff --git a/src/pages/common/components/FeedCard/index.ts b/src/pages/common/components/FeedCard/index.ts
index 71201cbdf..257e55820 100644
--- a/src/pages/common/components/FeedCard/index.ts
+++ b/src/pages/common/components/FeedCard/index.ts
@@ -1,4 +1,4 @@
-export * from "./FeedCard";
+export { default as FeedCard } from "./FeedCard";
 export * from "./components";
 export * from "./types";
 export * from "./utils";
diff --git a/src/pages/common/components/FeedItem/FeedItem.tsx b/src/pages/common/components/FeedItem/FeedItem.tsx
index 366753b49..56b8afca4 100644
--- a/src/pages/common/components/FeedItem/FeedItem.tsx
+++ b/src/pages/common/components/FeedItem/FeedItem.tsx
@@ -6,10 +6,7 @@ import React, {
   useMemo,
 } from "react";
 import { useFeedItemFollow } from "@/shared/hooks/useCases";
-import {
-  FeedLayoutItemChangeData,
-  SpaceListVisibility,
-} from "@/shared/interfaces";
+import { FeedLayoutItemChangeData } from "@/shared/interfaces";
 import {
   Circles,
   CirclesPermissions,
@@ -20,7 +17,7 @@ import {
   CommonNotion,
   DirectParent,
 } from "@/shared/models";
-import { checkIsItemVisibleForUser, InternalLinkData } from "@/shared/utils";
+import { checkIsItemVisibleForUser } from "@/shared/utils";
 import { useFeedItemSubscription } from "../../hooks";
 import { DiscussionFeedCard } from "../DiscussionFeedCard";
 import { ProposalFeedCard } from "../ProposalFeedCard";
@@ -113,14 +110,20 @@ const FeedItem = forwardRef<FeedItemRef, FeedItemProps>((props, ref) => {
   const getNonAllowedItems =
     outerGetNonAllowedItems || contextGetNonAllowedItems;
 
-  const handleUserClick = useMemo(
-    () => onUserSelect && ((userId: string) => onUserSelect(userId, commonId)),
+  const handleUserClick = useCallback(
+    (userId: string) => {
+      if (onUserSelect) {
+        onUserSelect(userId, commonId);
+      }
+    },
     [onUserSelect, commonId],
   );
 
   const handleActiveItemDataChange = useCallback(
     (data: FeedLayoutItemChangeData) => {
-      onActiveItemDataChange?.(data, commonId);
+      if (onActiveItemDataChange) {
+        onActiveItemDataChange(data, commonId);
+      }
     },
     [onActiveItemDataChange, commonId],
   );
@@ -130,13 +133,80 @@ const FeedItem = forwardRef<FeedItemRef, FeedItemProps>((props, ref) => {
       feedItemFollow.isUserFeedItemFollowDataFetched &&
       !feedItemFollow.userFeedItemFollowData
     ) {
-      onFeedItemUnfollowed?.(item.id);
+      if (onFeedItemUnfollowed) {
+        onFeedItemUnfollowed(item.id);
+      }
     }
   }, [
     feedItemFollow.isUserFeedItemFollowDataFetched,
     feedItemFollow.userFeedItemFollowData,
+    item.id,
+    onFeedItemUnfollowed,
   ]);
 
+
+  const generalProps = useMemo(
+    () => ({
+      ref,
+      item,
+      commonId,
+      commonName,
+      commonImage,
+      commonNotion,
+      pinnedFeedItems,
+      isActive,
+      isExpanded,
+      isProject,
+      isPinned,
+      governanceCircles,
+      isPreviewMode,
+      getLastMessage,
+      commonMember,
+      getNonAllowedItems,
+      isMobileVersion,
+      onActiveItemDataChange: handleActiveItemDataChange,
+      directParent,
+      rootCommonId,
+      feedItemFollow,
+      onUserSelect,
+      shouldPreLoadMessages,
+      withoutMenu,
+      onUserClick: handleUserClick,
+      onFeedItemClick,
+      onInternalLinkClick,
+    }),
+    [
+      ref,
+      item,
+      commonId,
+      commonName,
+      commonImage,
+      commonNotion,
+      pinnedFeedItems,
+      isActive,
+      isExpanded,
+      isProject,
+      isPinned,
+      governanceCircles,
+      isPreviewMode,
+      getLastMessage,
+      commonMember,
+      getNonAllowedItems,
+      isMobileVersion,
+      handleActiveItemDataChange,
+      directParent,
+      rootCommonId,
+      feedItemFollow,
+      onUserSelect,
+      shouldPreLoadMessages,
+      withoutMenu,
+      handleUserClick,
+      onFeedItemClick,
+      onInternalLinkClick,
+    ],
+  );
+
+
   if (
     shouldCheckItemVisibility &&
     !checkIsItemVisibleForUser({
@@ -150,36 +220,6 @@ const FeedItem = forwardRef<FeedItemRef, FeedItemProps>((props, ref) => {
     return null;
   }
 
-  const generalProps = {
-    ref,
-    item,
-    commonId,
-    commonName,
-    commonImage,
-    commonNotion,
-    pinnedFeedItems,
-    isActive,
-    isExpanded,
-    isProject,
-    isPinned,
-    governanceCircles,
-    isPreviewMode,
-    getLastMessage,
-    commonMember,
-    getNonAllowedItems,
-    isMobileVersion,
-    onActiveItemDataChange: handleActiveItemDataChange,
-    directParent,
-    rootCommonId,
-    feedItemFollow,
-    onUserSelect,
-    shouldPreLoadMessages,
-    withoutMenu,
-    onUserClick: handleUserClick,
-    onFeedItemClick,
-    onInternalLinkClick,
-  };
-
   if (item.data.type === CommonFeedType.Discussion) {
     return <DiscussionFeedCard {...generalProps} />;
   }
diff --git a/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx b/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx
index 3396b0756..8039066b8 100644
--- a/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx
+++ b/src/pages/common/components/ProposalFeedCard/ProposalFeedCard.tsx
@@ -482,4 +482,4 @@ const ProposalFeedCard = forwardRef<FeedItemRef, ProposalFeedCardProps>(
   },
 );
 
-export default ProposalFeedCard;
+export default ProposalFeedCard;
\ No newline at end of file
diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
index 205c35254..3eba16098 100644
--- a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
+++ b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -1,19 +1,19 @@
 import React, {
   CSSProperties,
   forwardRef,
-  ForwardRefRenderFunction,
-  ReactNode,
   useCallback,
   useEffect,
   useImperativeHandle,
   useMemo,
   useRef,
   useState,
+  ReactNode,
+  ForwardRefRenderFunction,
 } from "react";
 import { useSelector } from "react-redux";
 import { useHistory } from "react-router-dom";
 import PullToRefresh from "react-simple-pull-to-refresh";
-import { useWindowSize } from "react-use";
+import { useDeepCompareEffect, useWindowSize } from "react-use";
 import classNames from "classnames";
 import { selectUser } from "@/pages/Auth/store/selectors";
 import { useCommonMember } from "@/pages/OldCommon/hooks";
@@ -226,10 +226,40 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
       fetchedCommonMember,
     ],
   );
+
+  const [
+    commonMemberForSpecificCommonIds,
+    setCommonMemberForSpecificCommonIds,
+  ] = useState({});
+
+  useDeepCompareEffect(() => {
+    const chatItemCommonMember = { ...chatItem?.nestedItemData?.commonMember };
+
+    setCommonMemberForSpecificCommonIds((prevCommonMembers) => {
+      if (chatItemCommonMember?.commonId) {
+        prevCommonMembers[chatItemCommonMember.commonId] = chatItemCommonMember;
+      }
+
+      if (outerCommonMember?.commonId) {
+        prevCommonMembers[outerCommonMember.commonId] = outerCommonMember;
+      }
+
+      if (fetchedCommonMember?.commonId) {
+        prevCommonMembers[fetchedCommonMember.commonId] = fetchedCommonMember;
+      }
+
+      return prevCommonMembers;
+    });
+  }, [
+    fetchedCommonMember,
+    chatItem?.nestedItemData?.commonMember,
+    outerCommonMember,
+  ]);
   const userForProfile = useUserForProfile();
   const governance = chatItem?.nestedItemData
-    ? fetchedGovernance
+    ? fetchedGovernance || outerGovernance
     : outerGovernance || fetchedGovernance;
+
   const [splitPaneRef, setSplitPaneRef] = useState<Element | null>(null);
   const maxContentSize =
     settings?.getSplitViewMaxSize?.(windowWidth) ??
@@ -318,9 +348,16 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
   ]);
   const activeFeedItemId = chatItem?.feedItemId || feedItemIdForAutoChatOpen;
   const sizeKey = `${windowWidth}_${contentWidth}`;
-  const userCircleIds = useMemo(
-    () => Object.values(commonMember?.circles.map ?? {}),
-    [commonMember?.circles.map],
+
+  const getUserCircleIds = useCallback(
+    (commonId) => {
+      return Object.values(
+        commonMemberForSpecificCommonIds[commonId]?.circles.map ??
+          commonMember?.circles.map ??
+          {},
+      ) as string[];
+    },
+    [commonMemberForSpecificCommonIds, commonMember?.circles.map],
   );
 
   const selectedFeedItem = useMemo(
@@ -837,7 +874,7 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
                           item={item.feedItem}
                           governanceCircles={governance?.circles}
                           isMobileVersion={isTabletView}
-                          userCircleIds={userCircleIds}
+                          userCircleIds={getUserCircleIds(commonData?.id)}
                           isActive={isActive}
                           isExpanded={item.feedItem.id === expandedFeedItemId}
                           sizeKey={isActive ? sizeKey : undefined}
@@ -923,7 +960,9 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
                       isProject={selectedItemCommonData.isProject}
                       governanceCircles={governance?.circles}
                       selectedFeedItem={selectedFeedItem?.feedItem}
-                      userCircleIds={userCircleIds}
+                      userCircleIds={getUserCircleIds(
+                        selectedItemCommonData.id,
+                      )}
                       isShowFeedItemDetailsModal={isShowFeedItemDetailsModal}
                       sizeKey={sizeKey}
                       isMainModalOpen={Boolean(chatItem)}
@@ -979,4 +1018,4 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
   );
 };
 
-export default forwardRef(FeedLayout);
+export default forwardRef(FeedLayout);
\ No newline at end of file
diff --git a/src/shared/models/Common.tsx b/src/shared/models/Common.tsx
index c5d79b1d1..ca92fefb3 100644
--- a/src/shared/models/Common.tsx
+++ b/src/shared/models/Common.tsx
@@ -172,6 +172,7 @@ export interface CommonMember {
   isFollowing: boolean;
   streamsUnreadCountByProjectStream?: Record<string, number>;
   unreadCountByProjectStream?: Record<string, number>;
+  commonId?: string;
 }
 
 export interface CirclesPermissions {