diff --git a/ReportImp/LebenshilfeBadKreuznachFUD/Invoicing/CustomInvoiceCreation.cs b/ReportImp/LebenshilfeBadKreuznachFUD/Invoicing/CustomInvoiceCreation.cs
index 8760853ae..c5b017550 100644
--- a/ReportImp/LebenshilfeBadKreuznachFUD/Invoicing/CustomInvoiceCreation.cs
+++ b/ReportImp/LebenshilfeBadKreuznachFUD/Invoicing/CustomInvoiceCreation.cs
@@ -156,7 +156,7 @@ namespace LebenshilfeBadKreuznachFUD.Invoicing
 		{
 			var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
 			InvoiceItem wg = null;
-			if (serviceRecordsInPeriod.Any(s => s.ServiceDescription.CategoryName.ToLower().Contains("entlastung")))
+			if (list.Count > 0 && serviceRecordsInPeriod.Any(s => s.ServiceDescription.CategoryName.ToLower().Contains("entlastung")))
 			{
 				wg = CreateHausbesuchspauschale(serviceRecordsInPeriod, invoicePeriod, scap);
 				if (wg != null)
diff --git a/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.cs b/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.cs
index 409a21f75..f22f6c120 100644
--- a/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.cs
+++ b/ReportImp/LebenshilfeBadKreuznachFUD/Reporting/Reports/ServiceInvoiceReport.cs
@@ -69,7 +69,7 @@ namespace LebenshilfeBadKreuznachFUD
             {
                 sb.AppendLine(pRO.RecipientOrganisation);
             }
-            if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1))
+            if (!String.IsNullOrEmpty(pRO.RecipientAddressLine1) && pRO.RecipientOrganisation.ToLower() != "selbstzahler")
             {
                 sb.AppendLine(pRO.RecipientAddressLine1);
             }