diff --git a/src/app/api/mobile/discussion-general/[id]/comment/route.ts b/src/app/api/mobile/discussion-general/[id]/comment/route.ts
index da842a6..6df4622 100644
--- a/src/app/api/mobile/discussion-general/[id]/comment/route.ts
+++ b/src/app/api/mobile/discussion-general/[id]/comment/route.ts
@@ -70,7 +70,9 @@ export async function POST(request: Request, context: { params: { id: string } }
          }
       })
 
-      const dataFCM = member.map((v: any) => ({
+      const memberFilter = member.filter((v: any) => v.idUser != userMobile.id)
+
+      const dataFCM = memberFilter.map((v: any) => ({
          ..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),
          tokens: v.User.TokenDeviceUser.map((v: any) => v.token)
       }))
@@ -106,7 +108,7 @@ export async function POST(request: Request, context: { params: { id: string } }
          token: tokenUnique,
          title: "Komentar Baru",
          body: `${userSent?.name}: ${data.comment}`,
-         data: { id: data.id, category: "discussion", content: id }
+         data: { id: data.id, category: "discussion-general", content: id }
       })
 
       // create log user
diff --git a/src/app/api/mobile/discussion/[id]/comment/route.ts b/src/app/api/mobile/discussion/[id]/comment/route.ts
index 52216af..e1b0fbc 100644
--- a/src/app/api/mobile/discussion/[id]/comment/route.ts
+++ b/src/app/api/mobile/discussion/[id]/comment/route.ts
@@ -86,7 +86,9 @@ export async function POST(request: Request, context: { params: { id: string } }
             }
         })
 
-        const dataFCM = member.map((v: any) => ({
+        const memberFilter = member.filter((v: any) => v.idUser != userMobile.id)
+
+        const dataFCM = memberFilter.map((v: any) => ({
             ..._.omit(v, ["idUser", "User", "Subscribe", "TokenDeviceUser"]),
             tokens: v.User.TokenDeviceUser.map((v: any) => v.token)
         }))
@@ -122,7 +124,7 @@ export async function POST(request: Request, context: { params: { id: string } }
             token: tokenUnique,
             title: "Komentar Baru",
             body: `${userSent?.name}: ${comment}`,
-            data: { id: data.id, category: `division/${dataDivision?.idDivision}/discussion/`, content: id }
+            data: { id: data.id, category: `division/${dataDivision?.idDivision}/discussion`, content: id }
         })
 
         // create log user