diff --git a/application/Espo/ORM/Mapper/BaseMapper.php b/application/Espo/ORM/Mapper/BaseMapper.php
index a479279fb6..6777ce4d3b 100644
--- a/application/Espo/ORM/Mapper/BaseMapper.php
+++ b/application/Espo/ORM/Mapper/BaseMapper.php
@@ -230,8 +230,7 @@ class BaseMapper implements RDBMapper
             ->build();
 
         $wrap = $aggregation === self::FUNC_COUNT && (
-            $select->isDistinct() ||
-            $select->getGroup() && $select->getHaving()
+            $select->isDistinct() || $select->getGroup()
         );
 
         if (!$wrap) {