diff --git a/src/Controller/ExportController.php b/src/Controller/ExportController.php
index bff64158..48c47a6d 100644
--- a/src/Controller/ExportController.php
+++ b/src/Controller/ExportController.php
@@ -93,6 +93,7 @@ class ExportController extends AbstractController
         $entries = $this->getEntries($query);
 
         return $this->render('export/index.html.twig', [
+            'query' => $query,
             'entries' => $entries,
             'form' => $form->createView(),
             'renderer' => $this->export->getRenderer(),
diff --git a/src/Repository/TimesheetRepository.php b/src/Repository/TimesheetRepository.php
index a30d376f..b69f4f4d 100644
--- a/src/Repository/TimesheetRepository.php
+++ b/src/Repository/TimesheetRepository.php
@@ -352,16 +352,11 @@ class TimesheetRepository extends AbstractRepository
 
         if (TimesheetQuery::STATE_RUNNING == $query->getState()) {
             $qb->andWhere($qb->expr()->isNull('t.end'));
+        } elseif (TimesheetQuery::STATE_STOPPED == $query->getState()) {
+            $qb->andWhere($qb->expr()->isNotNull('t.end'));
         }
 
-        if (TimesheetQuery::STATE_STOPPED == $query->getState()) {
-            $qb->andWhere($qb->expr()->isNotNull('t.end'));
-
-            if (null !== $query->getEnd()) {
-                $qb->andWhere('t.end <= :end')
-                    ->setParameter('end', $query->getEnd());
-            }
-        } elseif (null !== $query->getEnd()) {
+        if (null !== $query->getEnd()) {
             $qb->andWhere('t.begin <= :end')
                 ->setParameter('end', $query->getEnd());
         }