diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
index 4b888d22f..c685de630 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
@@ -46,14 +46,7 @@ final class AgentAggregator implements AggregatorInterface
         }
 
         $qb->addSelect('caluser.id AS agent_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('agent_aggregator');
-        } else {
-            $qb->groupBy('agent_aggregator');
-        }
+        $qb->addGroupBy('agent_aggregator');
     }
 
     public function applyOn(): string
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
index 5daf4231c..53ecba909 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
@@ -47,14 +47,7 @@ class CancelReasonAggregator implements AggregatorInterface
         }
 
         $qb->addSelect('IDENTITY(cal.cancelReason) as cancel_reason_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('cancel_reason_aggregator');
-        } else {
-            $qb->groupBy('cancel_reason_aggregator');
-        }
+        $qb->addGroupBy('cancel_reason_aggregator');
     }
 
     public function applyOn(): string
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
index e5acf8f16..f56bc61cb 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
@@ -46,14 +46,7 @@ final class JobAggregator implements AggregatorInterface
         }
 
         $qb->addSelect('IDENTITY(caluser.userJob) as job_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('job_aggregator');
-        } else {
-            $qb->groupBy('job_aggregator');
-        }
+        $qb->addGroupBy('job_aggregator');
     }
 
     public function applyOn(): string
diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
index e027f5a9e..6d42aed89 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -46,14 +46,7 @@ final class LocationTypeAggregator implements AggregatorInterface
         }
 
         $qb->addSelect('IDENTITY(calloc.locationType) as location_type_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('location_type_aggregator');
-        } else {
-            $qb->groupBy('location_type_aggregator');
-        }
+        $qb->addGroupBy('location_type_aggregator');
     }
 
     public function applyOn(): string
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
index 6c04086e5..a3618f40f 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;