diff --git a/pkg/services/wallets.go b/pkg/services/wallets.go
index 1de103d..858ef55 100644
--- a/pkg/services/wallets.go
+++ b/pkg/services/wallets.go
@@ -90,7 +90,11 @@ func (as *WalletService) GetHeader(am *models.Auth, embed string, walletId strin
 
 	for _, sub := range *subscriptions {
 		startDate := sub.StartDate
-		for startDate.Before(firstOfMonthAfterNext) {
+		stopDate := firstOfMonthAfterNext
+		if sub.HasEnd {
+			stopDate = sub.EndDate
+		}
+		for startDate.Before(stopDate) {
 			trans := sub.ToTrans()
 			trans.TransactionDate = startDate
 			addWhere(&wallets, sub.WalletID, *trans)