diff --git a/nummi/account/views.py b/nummi/account/views.py
index 691bc78..446ac30 100644
--- a/nummi/account/views.py
+++ b/nummi/account/views.py
@@ -41,7 +41,7 @@ class AccountUpdateView(NummiUpdateView):
                 "new_statement", kwargs={"account": account.pk}
             ),
             "statements": _statements[:8],
-            "history": history(account.transaction_set.exclude(category__budget=False)),
+            "history": history(account.transaction_set),
         }
 
 
diff --git a/nummi/transaction/views.py b/nummi/transaction/views.py
index ad917e2..6b1f56e 100644
--- a/nummi/transaction/views.py
+++ b/nummi/transaction/views.py
@@ -153,8 +153,8 @@ class TransactionYearView(UserMixin, TransactionACMixin, YearArchiveView):
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        h_data = context_data["transactions"]
-        if "account" not in self.kwargs and "category" not in self.kwargs:
+        h_data = context_data.get("transactions")
+        if not (context_data.get("account") or context_data.get("category")):
             h_data = h_data.exclude(category__budget=False)
 
         return context_data | {"history": history(h_data)}