diff --git a/src/@types/subsocial.d.ts b/src/@types/subsocial.d.ts
index e1292cb4e..e29dc63a6 100644
--- a/src/@types/subsocial.d.ts
+++ b/src/@types/subsocial.d.ts
@@ -101,6 +101,7 @@ declare module '@subsocial/api/types' {
         blockchainSyncFailed?: boolean
         dataType?: 'persistent' | 'optimistic' | 'offChain'
         parentPostId?: string | null
+        approvedInRootPost?: boolean
       },
     PostContent
   > & { requestedId?: string }
diff --git a/src/components/chats/ChatItem/ChatItem.tsx b/src/components/chats/ChatItem/ChatItem.tsx
index 6a847a883..b039906b2 100644
--- a/src/components/chats/ChatItem/ChatItem.tsx
+++ b/src/components/chats/ChatItem/ChatItem.tsx
@@ -52,6 +52,9 @@ export default function ChatItem({
 
   const canRenderEmbed = useCanRenderEmbed(link ?? '')
 
+  if (showApproveButton && message.struct.approvedInRootPost) return null
+  if (!showApproveButton && !message.struct.approvedInRootPost) return null
+
   if (!body && (!extensions || extensions.length === 0)) return null
 
   const isEmojiOnly = shouldRenderEmojiChatItem(body ?? '')
diff --git a/src/components/extensions/common/CommonChatItem.tsx b/src/components/extensions/common/CommonChatItem.tsx
index ac5a6e3e0..415554356 100644
--- a/src/components/extensions/common/CommonChatItem.tsx
+++ b/src/components/extensions/common/CommonChatItem.tsx
@@ -1,7 +1,6 @@
 import Button from '@/components/Button'
 import LinkText from '@/components/LinkText'
 import { ProfilePreviewModalName } from '@/components/ProfilePreviewModalWrapper'
-import Toast from '@/components/Toast'
 import { useModerateWithSuccessToast } from '@/components/chats/ChatItem/ChatItemMenus'
 import ChatRelativeTime from '@/components/chats/ChatItem/ChatRelativeTime'
 import MessageStatusIndicator from '@/components/chats/ChatItem/MessageStatusIndicator'
@@ -18,7 +17,6 @@ import { useMyMainAddress } from '@/stores/my-account'
 import { cx } from '@/utils/class-names'
 import { getTimeRelativeToNow } from '@/utils/date'
 import Linkify from 'linkify-react'
-import { toast } from 'sonner'
 import { ExtensionChatItemProps } from '../types'
 
 type DerivativesData = {
@@ -324,19 +322,7 @@ function ApproveButton({
   ownerId: string
 }) {
   const { data: profile } = getProfileQuery.useQuery(ownerId)
-  const { mutate } = useApproveUser({
-    onSuccess: () => {
-      toast.custom((t) => (
-        <Toast
-          t={t}
-          type='default'
-          title={`You have approved ${
-            profile?.profileSpace?.content?.name || 'user'
-          }`}
-        />
-      ))
-    },
-  })
+  const { mutate } = useApproveUser()
   return (
     <Button
       variant='greenOutline'
diff --git a/src/services/datahub/events/subscription.tsx b/src/services/datahub/events/subscription.tsx
index 8ac96e027..f30e3fd02 100644
--- a/src/services/datahub/events/subscription.tsx
+++ b/src/services/datahub/events/subscription.tsx
@@ -19,6 +19,7 @@ import {
   SubscribeEventsSubscriptionVariables,
 } from '../generated-query'
 import { callIdToPostIdMap } from '../posts/mutation'
+import { getProfileQuery } from '../profiles/query'
 import { getGamificationTasksErrorQuery } from '../tasks/query'
 import { datahubSubscription } from '../utils'
 
@@ -51,6 +52,7 @@ const SUBSCRIBE_EVENTS = gql`
         msg
         code
         callId
+        extension
       }
     }
   }
@@ -205,6 +207,26 @@ async function processSubscriptionEvent(
       break
   }
 
+  if (
+    eventData.meta.callName ===
+    SocialCallName.SynthSocialProfileSetActionPermissions
+  ) {
+    const profile = getProfileQuery.getQueryData(
+      client,
+      eventData.meta.extension?.updatedCreatorAddress ?? ''
+    )
+    toast.custom((t) => (
+      <Toast
+        t={t}
+        type='default'
+        title={`You have approved ${
+          profile?.profileSpace?.content?.name || 'user'
+        }`}
+      />
+    ))
+    return
+  }
+
   if (eventData.meta.callName === SocialCallName.SynthGamificationClaimTask) {
     claimTaskErrorStore.set(eventData.meta.code)
 
diff --git a/src/services/datahub/generated-query.ts b/src/services/datahub/generated-query.ts
index 01bdd8b55..c84cef7b3 100644
--- a/src/services/datahub/generated-query.ts
+++ b/src/services/datahub/generated-query.ts
@@ -2234,6 +2234,7 @@ export type SubscribeEventsSubscription = {
       msg?: string | null
       code: ServiceMessageStatusCode
       callId?: string | null
+      extension?: any | null
     }
   }
 }
@@ -2623,6 +2624,7 @@ export type DatahubPostFragmentFragment = {
   createdAtTime?: any | null
   title?: string | null
   body?: string | null
+  approvedInRootPost: boolean
   createdByAccount: { __typename?: 'Account'; id: string }
   space?: { __typename?: 'Space'; id: string } | null
   ownedByAccount: { __typename?: 'Account'; id: string }
@@ -2655,6 +2657,7 @@ export type GetPostsQuery = {
       createdAtTime?: any | null
       title?: string | null
       body?: string | null
+      approvedInRootPost: boolean
       createdByAccount: { __typename?: 'Account'; id: string }
       space?: { __typename?: 'Space'; id: string } | null
       ownedByAccount: { __typename?: 'Account'; id: string }
@@ -2688,6 +2691,7 @@ export type GetOptimisticPostsQuery = {
       createdAtTime?: any | null
       title?: string | null
       body?: string | null
+      approvedInRootPost: boolean
       createdByAccount: { __typename?: 'Account'; id: string }
       space?: { __typename?: 'Space'; id: string } | null
       ownedByAccount: { __typename?: 'Account'; id: string }
@@ -2720,6 +2724,7 @@ export type GetCommentIdsInPostIdQuery = {
       createdAtTime?: any | null
       title?: string | null
       body?: string | null
+      approvedInRootPost: boolean
       createdByAccount: { __typename?: 'Account'; id: string }
       space?: { __typename?: 'Space'; id: string } | null
       ownedByAccount: { __typename?: 'Account'; id: string }
@@ -2784,6 +2789,7 @@ export type GetOwnedPostsQuery = {
       createdAtTime?: any | null
       title?: string | null
       body?: string | null
+      approvedInRootPost: boolean
       createdByAccount: { __typename?: 'Account'; id: string }
       space?: { __typename?: 'Space'; id: string } | null
       ownedByAccount: { __typename?: 'Account'; id: string }
@@ -2815,6 +2821,7 @@ export type GetPostsBySpaceIdQuery = {
       createdAtTime?: any | null
       title?: string | null
       body?: string | null
+      approvedInRootPost: boolean
       createdByAccount: { __typename?: 'Account'; id: string }
       space?: { __typename?: 'Space'; id: string } | null
       ownedByAccount: { __typename?: 'Account'; id: string }
@@ -2857,6 +2864,7 @@ export type SubscribePostSubscription = {
       persistentId?: string | null
       optimisticId?: string | null
       dataType: DataType
+      approvedInRootPost: boolean
       rootPost?: { __typename?: 'Post'; persistentId?: string | null } | null
     }
   }
@@ -2979,6 +2987,7 @@ export const DatahubPostFragment = gql`
     }
     title
     body
+    approvedInRootPost
     ownedByAccount {
       id
     }
@@ -3209,6 +3218,7 @@ export const SubscribeEvents = gql`
         msg
         code
         callId
+        extension
       }
     }
   }
@@ -3612,6 +3622,7 @@ export const SubscribePost = gql`
         persistentId
         optimisticId
         dataType
+        approvedInRootPost
         rootPost {
           persistentId
         }
diff --git a/src/services/datahub/mappers.ts b/src/services/datahub/mappers.ts
index 4a6f82b0d..5bda75898 100644
--- a/src/services/datahub/mappers.ts
+++ b/src/services/datahub/mappers.ts
@@ -51,6 +51,7 @@ export const mapDatahubPostFragment = (
     repliesCount: 0,
     sharesCount: 0,
     spaceId: '',
+    approvedInRootPost: post.approvedInRootPost ?? false,
     isUpdated: false,
     rootPostId: post.rootPost?.persistentId ?? '',
     parentPostId: null,
diff --git a/src/services/datahub/posts/fetcher.ts b/src/services/datahub/posts/fetcher.ts
index 99e370a80..ed882c778 100644
--- a/src/services/datahub/posts/fetcher.ts
+++ b/src/services/datahub/posts/fetcher.ts
@@ -21,6 +21,7 @@ export const DATAHUB_POST_FRAGMENT = gql`
     }
     title
     body
+    approvedInRootPost
     ownedByAccount {
       id
     }
diff --git a/src/services/datahub/posts/subscription.tsx b/src/services/datahub/posts/subscription.tsx
index 2aa64818e..ecb2d1571 100644
--- a/src/services/datahub/posts/subscription.tsx
+++ b/src/services/datahub/posts/subscription.tsx
@@ -67,6 +67,7 @@ const SUBSCRIBE_POST = gql`
         persistentId
         optimisticId
         dataType
+        approvedInRootPost
         rootPost {
           persistentId
         }
@@ -149,20 +150,34 @@ async function processMessage(
     getPostQuery.invalidate(queryClient, newestId)
   } else {
     if (dataFromPersistentId) {
+      getPostQuery.setQueryData(queryClient, newestId, (oldData) => {
+        if (!oldData) return oldData
+        return {
+          ...oldData,
+          struct: {
+            ...oldData.struct,
+            approvedInRootPost: eventData.entity.approvedInRootPost,
+          },
+        }
+      })
       await getPostQuery.invalidate(queryClient, newestId)
     } else {
       await getPostQuery.fetchQuery(queryClient, newestId)
     }
   }
 
+  const newPost = getPostQuery.getQueryData(queryClient, newestId)
   if (isCreationEvent) {
-    const newPost = getPostQuery.getQueryData(queryClient, newestId)
     const tokenomics = await getTokenomicsMetadataQuery.fetchQuery(
       queryClient,
       null
     )
     const myAddress = getMyMainAddress()
-    if (newPost?.struct.ownerId === myAddress && isCreationEvent) {
+    if (
+      newPost?.struct.ownerId === myAddress &&
+      isCreationEvent &&
+      newPost.struct.approvedInRootPost
+    ) {
       toast.custom((t) => (
         <Toast
           t={t}
@@ -178,7 +193,10 @@ async function processMessage(
 
   getPaginatedPostIdsByPostId.setQueryFirstPageData(
     queryClient,
-    { postId: rootPostId, onlyDisplayUnapprovedMessages: false },
+    {
+      postId: rootPostId,
+      onlyDisplayUnapprovedMessages: !newPost?.struct.approvedInRootPost,
+    },
     (oldData) => {
       if (!oldData) return oldData
       const oldIdsSet = new Set(oldData)