diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php
index 09863759f1..378bb25536 100644
--- a/app/Http/Controllers/Recurring/ShowController.php
+++ b/app/Http/Controllers/Recurring/ShowController.php
@@ -84,6 +84,8 @@ class ShowController extends Controller
         $transformer->setParameters(new ParameterBag());
 
         $array                 = $transformer->transform($recurrence);
+
+
         $groups                = $this->recurring->getTransactions($recurrence);
         $today                 = today(config('app.timezone'));
         $array['repeat_until'] = null !== $array['repeat_until'] ? new Carbon($array['repeat_until']) : null;
diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php
index 5a0e2f42bd..489434d6d3 100644
--- a/app/Repositories/Recurring/RecurringRepository.php
+++ b/app/Repositories/Recurring/RecurringRepository.php
@@ -408,10 +408,15 @@ class RecurringRepository implements RecurringRepositoryInterface
 
     private function filterMaxDate(?Carbon $max, array $occurrences): array
     {
-        if (null === $max) {
-            return $occurrences;
-        }
         $filtered = [];
+        if (null === $max) {
+            foreach ($occurrences as $date) {
+                if ($date->gt(today())) {
+                    $filtered[] = $date;
+                }
+            }
+            return $filtered;
+        }
         foreach ($occurrences as $date) {
             if ($date->lte($max) && $date->gt(today())) {
                 $filtered[] = $date;
diff --git a/app/Transformers/RecurrenceTransformer.php b/app/Transformers/RecurrenceTransformer.php
index efff57080c..0204e4363a 100644
--- a/app/Transformers/RecurrenceTransformer.php
+++ b/app/Transformers/RecurrenceTransformer.php
@@ -128,7 +128,8 @@ class RecurrenceTransformer extends AbstractTransformer
             ];
 
             // get the (future) occurrences for this specific type of repetition:
-            $occurrences     = $this->repository->getXOccurrencesSince($repetition, $fromDate, new Carbon(), 5);
+            $amount = 'daily' === $repetition->repetition_type ? 9 : 5;
+            $occurrences     = $this->repository->getXOccurrencesSince($repetition, $fromDate, now(), $amount);
 
             /** @var Carbon $carbon */
             foreach ($occurrences as $carbon) {