diff --git a/server/routers/resource/listResources.ts b/server/routers/resource/listResources.ts
index 16b83e0e..add3b2b5 100644
--- a/server/routers/resource/listResources.ts
+++ b/server/routers/resource/listResources.ts
@@ -148,43 +148,6 @@ const unhealthy_targets = sql<number>`SUM(
                     END
                 ) `;
 
-function countResourcesBase() {
-    return db
-        .select({ count: count() })
-        .from(resources)
-        .leftJoin(
-            resourcePassword,
-            eq(resourcePassword.resourceId, resources.resourceId)
-        )
-        .leftJoin(
-            resourcePincode,
-            eq(resourcePincode.resourceId, resources.resourceId)
-        )
-        .leftJoin(
-            resourceHeaderAuth,
-            eq(resourceHeaderAuth.resourceId, resources.resourceId)
-        )
-        .leftJoin(
-            resourceHeaderAuthExtendedCompatibility,
-            eq(
-                resourceHeaderAuthExtendedCompatibility.resourceId,
-                resources.resourceId
-            )
-        )
-        .leftJoin(targets, eq(targets.resourceId, resources.resourceId))
-        .leftJoin(
-            targetHealthCheck,
-            eq(targetHealthCheck.targetId, targets.targetId)
-        )
-        .groupBy(
-            resources.resourceId,
-            resourcePassword.passwordId,
-            resourcePincode.pincodeId,
-            resourceHeaderAuth.headerAuthId,
-            resourceHeaderAuthExtendedCompatibility.headerAuthExtendedCompatibilityId
-        );
-}
-
 function queryResourcesBase() {
     return db
         .select({
@@ -422,23 +385,20 @@ export async function listResources(
             }
         }
 
-        let baseQuery = queryResourcesBase();
-        let countQuery = countResourcesBase().where(conditions);
-
-        if (aggregateFilters) {
-            // @ts-expect-error idk why this is causing a type error
-            baseQuery = baseQuery.having(aggregateFilters);
-        }
-        if (aggregateFilters) {
-            // @ts-expect-error idk why this is causing a type error
-            countQuery = countQuery.having(aggregateFilters);
-        }
-
-        const rows: JoinedRow[] = await baseQuery
+        const baseQuery = queryResourcesBase()
             .where(conditions)
-            .limit(pageSize)
-            .offset(pageSize * (page - 1))
-            .orderBy(asc(resources.resourceId));
+            .having(aggregateFilters ?? sql`1 = 1`);
+
+        // we need to add `as` so that drizzle filters the result as a subquery
+        const countQuery = db.$count(baseQuery.as("filtered_resources"));
+
+        const [rows, totalCount] = await Promise.all([
+            baseQuery
+                .limit(pageSize)
+                .offset(pageSize * (page - 1))
+                .orderBy(asc(resources.resourceId)),
+            countQuery
+        ]);
 
         const resourceIdList = rows.map((row) => row.resourceId);
         const allResourceTargets =
@@ -495,9 +455,6 @@ export async function listResources(
 
         const resourcesList: ResourceWithTargets[] = Array.from(map.values());
 
-        const totalCountResult = await countQuery;
-        const totalCount = totalCountResult[0]?.count ?? 0;
-
         return response<ListResourcesResponse>(res, {
             data: {
                 resources: resourcesList,
diff --git a/server/routers/site/listSites.ts b/server/routers/site/listSites.ts
index 8a0a85ab..e27a328a 100644
--- a/server/routers/site/listSites.ts
+++ b/server/routers/site/listSites.ts
@@ -226,7 +226,6 @@ export async function listSites(
             parsedQuery.data;
 
         const accessibleSiteIds = accessibleSites.map((site) => site.siteId);
-        const baseQuery = querySitesBase();
 
         let conditions = and(
             inArray(sites.siteId, accessibleSiteIds),
@@ -245,27 +244,31 @@ export async function listSites(
             conditions = and(conditions, eq(sites.online, online));
         }
 
-        const countQuery = countSitesBase().where(conditions);
+        const baseQuery = querySitesBase().where(conditions);
+
+        // we need to add `as` so that drizzle filters the result as a subquery
+        const countQuery = db.$count(baseQuery.as("filtered_sites"));
 
         const siteListQuery = baseQuery
-            .where(conditions)
             .limit(pageSize)
-            .offset(pageSize * (page - 1));
-
-        if (sort_by) {
-            siteListQuery.orderBy(
-                order === "asc" ? asc(sites[sort_by]) : desc(sites[sort_by])
+            .offset(pageSize * (page - 1))
+            .orderBy(
+                sort_by
+                    ? order === "asc"
+                        ? asc(sites[sort_by])
+                        : desc(sites[sort_by])
+                    : asc(sites.siteId)
             );
-        }
-        const totalCountResult = await countQuery;
-        const totalCount = totalCountResult[0].count;
+
+        const [totalCount, rows] = await Promise.all([
+            countQuery,
+            siteListQuery
+        ]);
 
         // Get latest version asynchronously without blocking the response
         const latestNewtVersionPromise = getLatestNewtVersion();
 
-        const sitesWithUpdates: SiteWithUpdateAvailable[] = (
-            await siteListQuery
-        ).map((site) => {
+        const sitesWithUpdates: SiteWithUpdateAvailable[] = rows.map((site) => {
             const siteWithUpdate: SiteWithUpdateAvailable = { ...site };
             // Initially set to false, will be updated if version check succeeds
             siteWithUpdate.newtUpdateAvailable = false;