diff --git a/src/app/api/mobile/announcement/route.ts b/src/app/api/mobile/announcement/route.ts
index 4ec8805..e26dfde 100644
--- a/src/app/api/mobile/announcement/route.ts
+++ b/src/app/api/mobile/announcement/route.ts
@@ -80,8 +80,8 @@ export async function GET(request: Request) {
 
 
         const announcements = await prisma.announcement.findMany({
-            // skip: dataSkip,
-            // take: 10,
+            skip: dataSkip,
+            take: 10,
             where: kondisi,
             select: {
                 id: true,
diff --git a/src/app/api/mobile/discussion-general/route.ts b/src/app/api/mobile/discussion-general/route.ts
index 2940ad4..c8c46fd 100644
--- a/src/app/api/mobile/discussion-general/route.ts
+++ b/src/app/api/mobile/discussion-general/route.ts
@@ -45,8 +45,8 @@ export async function GET(request: Request) {
       }
 
       const data = await prisma.discussion.findMany({
-         // skip: dataSkip,
-         // take: 10,
+         skip: dataSkip,
+         take: 10,
          where: {
             isActive: status == "false" ? false : true,
             idVillage: String(villageId),
diff --git a/src/app/api/mobile/user/route.ts b/src/app/api/mobile/user/route.ts
index 1729227..f7f4f38 100644
--- a/src/app/api/mobile/user/route.ts
+++ b/src/app/api/mobile/user/route.ts
@@ -18,7 +18,7 @@ export async function GET(request: Request) {
     const dataSkip = Number(page) * 10 - 10;
 
     if (userMobile == "null" || userMobile == undefined || userMobile == "") {
-      return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
+      return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 200 });
     }
 
     const user = await funGetUserById({ id: userMobile })
@@ -39,9 +39,7 @@ export async function GET(request: Request) {
       }
     })
 
-
-
-    if (page != undefined) {
+    if (page != "undefined" && page != "null" && page != "" && page!=undefined && page!=null) {
       const users = await prisma.user.findMany({
         skip: dataSkip,
         take: 10,