diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 16cac5c261..a76de3ace7 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -308,7 +308,7 @@ class AccountController extends Controller
             $journals = $collector->getPaginatedJournals();
             $journals->setPath('accounts/show/' . $account->id . '/' . $moment);
             $count = $journals->getCollection()->count();
-            if ($count === 0) {
+            if ($count === 0 && $loop < 3) {
                 $start->subDay();
                 $start = Navigation::startOfPeriod($start, $range);
                 $end   = Navigation::endOfPeriod($start, $range);
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index 329f46fdc8..f9d6bd72a7 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -302,7 +302,7 @@ class BudgetController extends Controller
         Log::info('Now at no-budget loop start.');
         while ($count === 0 && $loop < 3) {
             $loop++;
-            Log::info('Count is zero, search for journals.');
+            Log::info(sprintf('Count is zero, search for journals between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
             /** @var JournalCollectorInterface $collector */
             $collector = app(JournalCollectorInterface::class);
             $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page)
@@ -310,7 +310,7 @@ class BudgetController extends Controller
             $journals = $collector->getPaginatedJournals();
             $journals->setPath('/budgets/list/no-budget');
             $count = $journals->getCollection()->count();
-            if ($count === 0) {
+            if ($count === 0 && $loop < 3) {
                 $start->subDay();
                 $start = Navigation::startOfPeriod($start, $range);
                 $end   = Navigation::endOfPeriod($start, $range);
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index a760a0733d..c9aec777f4 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -216,7 +216,7 @@ class CategoryController extends Controller
             $journals = $collector->getPaginatedJournals();
             $journals->setPath('/categories/list/no-category');
             $count = $journals->getCollection()->count();
-            if ($count === 0) {
+            if ($count === 0 && $loop < 3) {
                 $start->subDay();
                 $start = Navigation::startOfPeriod($start, $range);
                 $end   = Navigation::endOfPeriod($start, $range);
@@ -300,7 +300,7 @@ class CategoryController extends Controller
             $journals = $collector->getPaginatedJournals();
             $journals->setPath('categories/show/' . $category->id);
             $count = $journals->getCollection()->count();
-            if ($count === 0) {
+            if ($count === 0 && $loop < 3) {
                 $start->subDay();
                 $start = Navigation::startOfPeriod($start, $range);
                 $end   = Navigation::endOfPeriod($start, $range);
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 91a0f6437f..ce6f2db7d6 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -293,7 +293,7 @@ class TagController extends Controller
             $journals = $collector->getPaginatedJournals();
             $journals->setPath($path);
             $count = $journals->getCollection()->count();
-            if ($count === 0) {
+            if ($count === 0 && $loop < 3) {
                 $start->subDay();
                 $start = Navigation::startOfPeriod($start, $range);
                 $end   = Navigation::endOfPeriod($start, $range);
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 764de4c669..1636ded76c 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -122,7 +122,7 @@ class TransactionController extends Controller
             $journals = $collector->getPaginatedJournals();
             $journals->setPath($path);
             $count = $journals->getCollection()->count();
-            if ($count === 0) {
+            if ($count === 0 && $loop < 3) {
                 $start->subDay();
                 $start = Navigation::startOfPeriod($start, $range);
                 $end   = Navigation::endOfPeriod($start, $range);