diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php
index 902055be4e..463fc16063 100644
--- a/src/applications/maniphest/query/ManiphestTaskQuery.php
+++ b/src/applications/maniphest/query/ManiphestTaskQuery.php
@@ -239,7 +239,7 @@ final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   protected function buildTaskCountSelectClause(AphrontDatabaseConnection $conn) {
     $parts = $this->buildSelectClauseParts($conn);
-    $parts[] = qsprintf($conn, 'COUNT(`task`.id) as count');
+    $parts[0] = qsprintf($conn, '`task`.id');
     return $this->formatSelectClause($conn, $parts);
   }
 
@@ -259,16 +259,18 @@ final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery {
     }
 
     if ($count_all_tasks) {
-      return queryfx_one(
+      $r = queryfx_all(
         $conn,
-        '%Q FROM %T task %Q %Q %Q %Q %Q',
+        '%Q %Q FROM %T task %Q %Q %Q %Q %Q',
         $this->buildTaskCountSelectClause($conn),
+        $group_column,
         $task_dao->getTableName(),
         $this->buildJoinClause($conn),
         $where,
+        $this->buildGroupClause($conn),
         $this->buildHavingClause($conn),
-        $this->buildOrderClause($conn),
-        $this->buildLimitClause($conn));
+        $this->buildOrderClause($conn));
+      return array('count' => count($r));
     } else {
       return queryfx_all(
         $conn,