diff --git a/packages/backend-core/src/utils.js b/packages/backend-core/src/utils.js
index 449b8609fb..419bf55830 100644
--- a/packages/backend-core/src/utils.js
+++ b/packages/backend-core/src/utils.js
@@ -150,7 +150,7 @@ exports.getBuildersCount = async () => {
   const builders = await queryGlobalView(ViewNames.USER_BY_BUILDERS, {
     include_docs: false,
   })
-  return builders.total_rows
+  return builders.length
 }
 
 exports.saveUser = async (
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index f465b6c5b5..d13b08f94c 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -135,7 +135,7 @@ export const fetch = async (ctx: any) => {
       delete user.password
     }
   }
-  ctx.body = users
+  ctx.body = all
 }
 
 // called internally by app server user find