diff --git a/repository/invoice.go b/repository/invoice.go
index 21a5505..6fc3885 100644
--- a/repository/invoice.go
+++ b/repository/invoice.go
@@ -40,6 +40,7 @@ func (ir _InvoiceRepository) ListInvoice(pid *string, startDate, endDate *types.
 		Select("i.*")
 	countQuery := ir.ds.
 		From(goqu.T("invoice").As("i")).
+		Join(goqu.T("tenement").As("t"), goqu.On(goqu.I("i.tenement_id").Eq(goqu.I("t.id")))).
 		Select(goqu.COUNT("*"))
 
 	if pid != nil && len(*pid) > 0 {
@@ -76,8 +77,10 @@ func (ir _InvoiceRepository) ListInvoice(pid *string, startDate, endDate *types.
 	if endDate != nil {
 		queryRange.SetUpper(endDate.ToEndingOfDate())
 	}
-	invoiceQuery = invoiceQuery.Where(goqu.L("i.issued_at <@ ?", queryRange))
-	countQuery = countQuery.Where(goqu.L("i.issued_at <@ ?", queryRange))
+	if !queryRange.IsEmptyOrWild() {
+		invoiceQuery = invoiceQuery.Where(goqu.L("i.issued_at <@ ?", queryRange))
+		countQuery = countQuery.Where(goqu.L("i.issued_at <@ ?", queryRange))
+	}
 
 	startRow := (page - 1) * config.ServiceSettings.ItemsPageSize
 	invoiceQuery = invoiceQuery.