diff --git a/src/Repository/AvailabilityRepository.php b/src/Repository/AvailabilityRepository.php
index 7666551..eb25923 100644
--- a/src/Repository/AvailabilityRepository.php
+++ b/src/Repository/AvailabilityRepository.php
@@ -47,19 +47,16 @@ class AvailabilityRepository extends ServiceEntityRepository
             ->leftJoin('availability.teamers', 'teamer')
             ->where($qb->expr()->andX(
                 $qb->expr()->gt('availability.dateFrom', ':today'),
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('teamer'),
-                    $qb->expr()->neq('teamer', ':teamer')
-                ),
+                $qb->expr()->notIn('availability', ':availabilities'),
                 $qb->expr()->orX(
                     $qb->expr()->isNull('availability.owner'),
-                    $qb->expr()->eq('availability.owner', ':owner')
+                    $qb->expr()->eq('availability.owner', ':teamer')
                 ),
                 $qb->expr()->isNull('availability.deletedAt')
             ))
             ->orderBy('availability.dateFrom', 'ASC')
             ->setParameter('teamer', $teamer)
-            ->setParameter('owner', $teamer)
+            ->setParameter('availabilities', $teamer->getAvailabilities())
             ->setParameter('today', new \DateTimeImmutable())
             ->getQuery()
             ->getResult()