diff --git a/assets/components/tracking/watchlist/WatchlistForm.tsx b/assets/components/tracking/watchlist/WatchlistForm.tsx
index 33cdd49..a8ffc01 100644
--- a/assets/components/tracking/watchlist/WatchlistForm.tsx
+++ b/assets/components/tracking/watchlist/WatchlistForm.tsx
@@ -98,8 +98,8 @@ export function WatchlistForm({form, connectors, onFinish, isCreation}: {
             form={form}
             onFinish={onFinish}
             initialValues={{
-                trackedEvents: ['last changed', 'transfer', 'expiration', 'deletion'],
-                trackedEppStatus: ['redemption period', 'pending delete', 'client hold', 'server hold']
+                trackedEvents: ['last changed', 'transfer', 'deletion'],
+                trackedEppStatus: ['auto renew period', 'redemption period', 'pending delete', 'client hold', 'server hold']
         }}
         >
 
diff --git a/src/Repository/DomainRepository.php b/src/Repository/DomainRepository.php
index e5cca66..85b694d 100644
--- a/src/Repository/DomainRepository.php
+++ b/src/Repository/DomainRepository.php
@@ -56,11 +56,8 @@ class DomainRepository extends ServiceEntityRepository
     {
         return $this->createQueryBuilder('d')
         ->join('d.watchLists', 'w')
-        ->join('d.events', 'de')
         ->where('w.user = :user')
         ->andWhere('d.deleted = false')
-        ->andWhere("de.action = 'expiration'")
-        ->andWhere('de.deleted = false')
         ->setParameter('user', $user)
         ->getQuery()
         ->getResult();