diff --git a/app/api/server/v1/groups.js b/app/api/server/v1/groups.js
index 8a81dddefd63..374f68a738f8 100644
--- a/app/api/server/v1/groups.js
+++ b/app/api/server/v1/groups.js
@@ -481,15 +481,21 @@ API.v1.addRoute('groups.listAll', { authRequired: true }, {
 		const { sort, fields, query } = this.parseJsonQuery();
 		const ourQuery = Object.assign({}, query, { t: 'p' });
 
-		let rooms = Rooms.find(ourQuery).fetch();
-		const totalCount = rooms.length;
-
-		rooms = Rooms.processQueryOptionsOnResult(rooms, {
+		const cursor = Rooms.find(ourQuery, {
 			sort: sort || { name: 1 },
 			skip: offset,
 			limit: count,
-			fields,
-		});
+			fields })
+
+		const totalCount = cursor.count();
+		const rooms = cursor.fetch();
+
+		// rooms = Rooms.processQueryOptionsOnResult(rooms, {
+		// 	sort: sort || { name: 1 },
+		// 	skip: offset,
+		// 	limit: count,
+		// 	fields,
+		// });
 
 		return API.v1.success({
 			groups: rooms.map((room) => this.composeRoomWithLastMessage(room, this.userId)),