diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 63639c149..1e911ff08 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -259,8 +259,8 @@ final class ActivityController extends AbstractController
 
         $filterArgs = [
             'my_activities' => $filter->getSingleCheckboxData('my_activities'),
-            'types' => $filter->getEntityChoiceData('activity_types'),
-            'jobs' => $filter->getEntityChoiceData('jobs'),
+            'types' => $filter->hasEntityChoice('activity_types') ? $filter->getEntityChoiceData('activity_types') : [],
+            'jobs' => $filter->hasEntityChoice('jobs') ? $filter->getEntityChoiceData('jobs') : [],
             'before' => $filter->getDateRangeData('activity_date')['to'],
             'after' => $filter->getDateRangeData('activity_date')['from'],
         ];
@@ -327,21 +327,28 @@ final class ActivityController extends AbstractController
 
         $filterBuilder
             ->addDateRange('activity_date', 'activity.date')
-            ->addSingleCheckbox('my_activities', 'activity_filter.My activities')
-            ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
-                'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
-                    $text = match ($activityType->hasCategory()) {
-                        true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()) . ' > ',
-                        false => '',
-                    };
+            ->addSingleCheckbox('my_activities', 'activity_filter.My activities');
 
-                    return $text . $this->translatableStringHelper->localize($activityType->getName());
-                }
-            ])
-            ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
-                'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel())
-            ])
-        ;
+        if (1 < count($types)) {
+            $filterBuilder
+                ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
+                    'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
+                        $text = match ($activityType->hasCategory()) {
+                            true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()) . ' > ',
+                            false => '',
+                        };
+
+                        return $text . $this->translatableStringHelper->localize($activityType->getName());
+                    }
+                ]);
+        }
+
+        if (1 < count($jobs)) {
+            $filterBuilder
+                ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
+                    'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel())
+                ]);
+        }
 
         return $filterBuilder->build();
     }
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
index 8f18f9102..c0ef1cd89 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
@@ -116,16 +116,31 @@ class FilterOrderHelper
             ->handleRequest($this->requestStack->getCurrentRequest());
     }
 
+    public function hasCheckboxData(string $name): bool
+    {
+        return array_key_exists($name, $this->checkboxes);
+    }
+
     public function getCheckboxData(string $name): array
     {
         return $this->getFormData()['checkboxes'][$name];
     }
 
+    public function hasSingleCheckboxData(string $name): bool
+    {
+        return array_key_exists($name, $this->singleCheckbox);
+    }
+
     public function getSingleCheckboxData(string $name): ?bool
     {
         return $this->getFormData()['single_checkboxes'][$name];
     }
 
+    public function hasEntityChoice(string $name): bool
+    {
+        return array_key_exists($name, $this->entityChoices);
+    }
+
     public function getEntityChoiceData($name): mixed
     {
         return $this->getFormData()['entity_choices'][$name];
@@ -149,6 +164,11 @@ class FilterOrderHelper
         return $this->singleCheckbox;
     }
 
+    public function hasDateRangeData(string $name): bool
+    {
+        return array_key_exists($name, $this->dateRanges);
+    }
+
     /**
      * @return array{to: ?DateTimeImmutable, from: ?DateTimeImmutable}
      */