diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index ba83739b49..7b95561765 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -35,7 +35,7 @@
             <td data-value="{{ entry.amount_max }}">
                 {{ entry.amount_max|formatAmount }}
             </td>
-            {% if entry.lastFoundMatch %}
+            {% if not entry.lastFoundMatch.isFuture %}
                 <td class="hidden-sm hidden-xs" data-value="{{ entry.lastFoundMatch.format('U') }}">
                     {{ entry.lastFoundMatch.formatLocalized(monthAndDayFormat) }}
                 </td>
@@ -45,7 +45,7 @@
                 </td>
             {% endif %}
 
-            {% if entry.nextExpectedMatch %}
+            {% if entry.nextExpectedMatch.isFuture %}
                 <td class="hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('U') }}">
                     {{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
                 </td>
diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twig
index 19122b4cd7..076487a1e0 100644
--- a/resources/views/reports/partials/budgets.twig
+++ b/resources/views/reports/partials/budgets.twig
@@ -47,7 +47,9 @@
                         {% endif %}
                     </td>
                     <td>
-                        {{ budgetLine.getLeft|formatAmount }}
+                        {% if(budgetLine.getOverspent == 0) %}
+                            {{ budgetLine.getLeft|formatAmount }}
+                        {% endif %}
                     </td>
                     <td>
                         {% if budgetLine.getOverspent != 0 %}