diff --git a/Classes/Domain/Repository/DateRepository.php b/Classes/Domain/Repository/DateRepository.php
index 7f1eecd..9177368 100644
--- a/Classes/Domain/Repository/DateRepository.php
+++ b/Classes/Domain/Repository/DateRepository.php
@@ -81,7 +81,10 @@ class DateRepository extends Repository
 
         if ($demand->getStart() === null && $demand->getEnd() === null) {
             $now = new \DateTime('now', new \DateTimeZone('Europe/Berlin'));
-            $constraints['untilnow'] = $query->greaterThanOrEqual('start', $now);
+            $constraints['nowAndFuture'] = $query->logicalOr([
+                $query->greaterThanOrEqual('start', $now),
+                $query->greaterThanOrEqual('end', $now)
+            ]);
         }
 
         if ($demand->getLimit() !== '') {