diff --git a/src/components/chats/ChatItem/variants/DefaultChatItem.tsx b/src/components/chats/ChatItem/variants/DefaultChatItem.tsx
index 6ed1917d7..76b165539 100644
--- a/src/components/chats/ChatItem/variants/DefaultChatItem.tsx
+++ b/src/components/chats/ChatItem/variants/DefaultChatItem.tsx
@@ -80,7 +80,7 @@ export default function DefaultChatItem({
             {body}
           </Linkify>
         </p>
-        {link && (
+        {link && linkMetadata?.title && (
           <LinkPreview
             renderNullIfLinkEmbedable
             className={cx('my-1')}
diff --git a/src/pages/[hubId]/[slug]/index.tsx b/src/pages/[hubId]/[slug]/index.tsx
index 252488fd5..39f92414f 100644
--- a/src/pages/[hubId]/[slug]/index.tsx
+++ b/src/pages/[hubId]/[slug]/index.tsx
@@ -76,8 +76,9 @@ async function getMessageIdsFromDatahub(client: QueryClient, chatId: string) {
       chatId
     )
   getPaginatedPostsByPostIdFromDatahubQuery.invalidateFirstQuery(client, chatId)
+  const messages = await getPostsServer(res.data)
 
-  return { messageIds: res.data, messages: res.messages }
+  return { messageIds: res.data, messages }
 }
 async function getMessageIdsFromChain(client: QueryClient, chatId: string) {
   const messageIds = await getCommentIdsByPostIdFromChainQuery.fetchQuery(
diff --git a/src/services/subsocial/datahub/generated-query.ts b/src/services/subsocial/datahub/generated-query.ts
index e749282d8..3c679a0c6 100644
--- a/src/services/subsocial/datahub/generated-query.ts
+++ b/src/services/subsocial/datahub/generated-query.ts
@@ -618,60 +618,6 @@ export type GetCommentIdsInPostIdQuery = {
       id: string
       persistentId?: string | null
       optimisticId?: string | null
-      dataType: DataType
-      content?: string | null
-      createdAtBlock?: number | null
-      createdAtTime?: any | null
-      title?: string | null
-      body?: string | null
-      summary?: string | null
-      isShowMore: boolean
-      image?: string | null
-      link?: string | null
-      hidden: boolean
-      blockchainSyncFailed: boolean
-      isComment: boolean
-      kind: PostKind
-      updatedAtTime?: any | null
-      canonical?: string | null
-      tagsOriginal?: string | null
-      followersCount?: number | null
-      inReplyToKind?: InReplyToKind | null
-      createdByAccount: { __typename?: 'Account'; id: string }
-      ownedByAccount: { __typename?: 'Account'; id: string }
-      space?: { __typename?: 'Space'; persistentId?: string | null } | null
-      rootPost?: {
-        __typename?: 'Post'
-        persistentId?: string | null
-        space?: { __typename?: 'Space'; persistentId?: string | null } | null
-      } | null
-      inReplyToPost?: {
-        __typename?: 'Post'
-        persistentId?: string | null
-      } | null
-      extensions: Array<{
-        __typename?: 'ContentExtension'
-        image?: string | null
-        amount?: string | null
-        chain?: string | null
-        collectionId?: string | null
-        decimals?: number | null
-        extensionSchemaId: ContentExtensionSchemaId
-        id: string
-        nftId?: string | null
-        token?: string | null
-        txHash?: string | null
-        message?: string | null
-        nonce?: string | null
-        url?: string | null
-        recipient?: { __typename?: 'Account'; id: string } | null
-        fromEvm?: { __typename?: 'EvmAccount'; id: string } | null
-        toEvm?: { __typename?: 'EvmAccount'; id: string } | null
-        pinnedResources?: Array<{
-          __typename?: 'ExtensionPinnedResource'
-          post?: { __typename?: 'Post'; id: string } | null
-        }> | null
-      }>
     }>
   }
 }
@@ -825,12 +771,10 @@ export const GetCommentIdsInPostId = gql`
         id
         persistentId
         optimisticId
-        ...DatahubPostFragment
       }
       total
     }
   }
-  ${DatahubPostFragment}
 `
 export const GetPostMetadata = gql`
   query GetPostMetadata($where: PostMetadataInput!) {
diff --git a/src/services/subsocial/datahub/posts/query.ts b/src/services/subsocial/datahub/posts/query.ts
index b9651ea9d..671834776 100644
--- a/src/services/subsocial/datahub/posts/query.ts
+++ b/src/services/subsocial/datahub/posts/query.ts
@@ -2,7 +2,6 @@ import { CHAT_PER_PAGE } from '@/constants/chat'
 import { getPostQuery } from '@/services/api/query'
 import { queryClient } from '@/services/provider'
 import { createQuery, poolQuery, QueryConfig } from '@/subsocial-query'
-import { PostData } from '@subsocial/api/types'
 import { QueryClient, useInfiniteQuery } from '@tanstack/react-query'
 import { gql } from 'graphql-request'
 import {
@@ -18,19 +17,15 @@ import {
   GetUnreadCountQueryVariables,
   QueryOrder,
 } from '../generated-query'
-import { mapDatahubPostFragment } from '../mappers'
 import { datahubQueryRequest } from '../utils'
-import { DATAHUB_POST_FRAGMENT } from './fetcher'
 
 const GET_COMMENT_IDS_IN_POST_ID = gql`
-  ${DATAHUB_POST_FRAGMENT}
   query GetCommentIdsInPostId($where: FindPostsArgs!) {
     findPosts(where: $where) {
       data {
         id
         persistentId
         optimisticId
-        ...DatahubPostFragment
       }
       total
     }
@@ -41,7 +36,6 @@ export type PaginatedPostsData = {
   page: number
   hasMore: boolean
   totalData: number
-  messages: PostData[]
 }
 async function getPaginatedPostsByRootPostId({
   page,
@@ -68,14 +62,10 @@ async function getPaginatedPostsByRootPostId({
     },
   })
   const optimisticIds = new Set<string>()
-  const messages: PostData[] = []
   const ids = res.findPosts.data.map((post) => {
     optimisticIds.add(post.optimisticId ?? '')
-    const message = mapDatahubPostFragment(post)
-    messages.push(message)
 
     const id = post.persistentId || post.id
-    getPostQuery.setQueryData(client, id, message)
     return id
   })
   const totalData = res.findPosts.total ?? 0
@@ -100,7 +90,6 @@ async function getPaginatedPostsByRootPostId({
     page,
     hasMore,
     totalData,
-    messages,
   }
 }
 const COMMENT_IDS_QUERY_KEY = 'comments'
diff --git a/src/services/subsocial/posts/mutation.ts b/src/services/subsocial/posts/mutation.ts
index f50958743..f6dbdcac1 100644
--- a/src/services/subsocial/posts/mutation.ts
+++ b/src/services/subsocial/posts/mutation.ts
@@ -142,7 +142,7 @@ async function generateMessageContent(
 ) {
   const { image, title, body } = params
 
-  if ('postId' in params) {
+  if ('postId' in params && params.postId) {
     const post = await getPostQuery.fetchQuery(client, params.postId)
     if (!post) throw new Error('Post not found')