diff --git a/Datagrid/Pager.php b/Datagrid/Pager.php
index 962b2733..33bf7477 100644
--- a/Datagrid/Pager.php
+++ b/Datagrid/Pager.php
@@ -36,8 +36,7 @@ public function computeNbResult()
             $countQuery->setParameters($this->getParameters());
         }
 
-        // TODO: use map/reduce for that
-        return $this->getQuery()->execute()->count();
+        return $countQuery->count()->getQuery()->execute();
     }
 
     /**