diff --git a/src/Form/ActivityEditForm.php b/src/Form/ActivityEditForm.php
index 42c7886f..cf5fceed 100644
--- a/src/Form/ActivityEditForm.php
+++ b/src/Form/ActivityEditForm.php
@@ -59,6 +59,7 @@ class ActivityEditForm extends AbstractType
                 'query_builder' => function (CustomerRepository $repo) use ($customer) {
                     return $repo->builderForEntityType($customer);
                 },
+                'data' => $customer ? $customer : null,
                 'required' => false,
                 'mapped' => false,
                 'attr' => [
diff --git a/src/Repository/ActivityRepository.php b/src/Repository/ActivityRepository.php
index 523f0135..ecb9de02 100644
--- a/src/Repository/ActivityRepository.php
+++ b/src/Repository/ActivityRepository.php
@@ -206,7 +206,9 @@ class ActivityRepository extends AbstractRepository
             $qb->orderBy('a.project', 'ASC');
         }
 
-        $qb->andWhere($or);
+        if ($or->count() > 0) {
+            $qb->andWhere($or);
+        }
 
         return $this->getBaseQueryResult($qb, $query);
     }