diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs
index 30a899209..d57b8cd30 100644
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -172,7 +172,8 @@ namespace BeWo.Service.ServiceImplementations
 
 				var s = PluginLoader.FindClass<AccountingService>();
 
-				var rtn = s.GetInvoiceBases(startDate, endDate, costBearerOid, invoiceId);
+				var invoiceBasesFuerGkv = s.GetInvoiceBases(startDate, endDate, costBearerOid, invoiceId);
+				invoiceBasesFuerGkv.AddRange(s.GetInvoiceBases(startDate, endDate, costBearerOid, "RechnungHaeuslicheKrankenpflege"));
 
 				HashSet<long> invoices = new HashSet<long>();
 				foreach (var gkv_abrechnung in gkv_abrechnungen)
@@ -183,12 +184,12 @@ namespace BeWo.Service.ServiceImplementations
 					}
 				}
 
-				foreach (var invoice in rtn)
+				foreach (var invoice in invoiceBasesFuerGkv)
 				{
 					invoice.IsAlreadyInActiveGkvAbrechnung = invoices.Contains(invoice.InvoiceBaseOid.Value);
 				}
 
-				return rtn;
+				return invoiceBasesFuerGkv;
 			}
 			catch (Exception e)
 			{
diff --git a/Service/ServiceImplementations/GkvAccountingServiceImp.cs b/Service/ServiceImplementations/GkvAccountingServiceImp.cs
index fb7401a3f..89810950d 100644
--- a/Service/ServiceImplementations/GkvAccountingServiceImp.cs
+++ b/Service/ServiceImplementations/GkvAccountingServiceImp.cs
@@ -18,6 +18,7 @@ using BS.Shared.Extensions;
 using BS.Shared.Interface;
 using Dakota;
 using Dakota.Logic;
+using Dakota.Models.Schlüssels;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -380,7 +381,11 @@ namespace BeWo.Service.ServiceImplementations
 			{
 				eval(GkvValidation.ValidateGkvAbrechnung(gkvAbrechnung, gkvAbrechnung.InvoiceBases));
 
-				var manager = new DakotaManager();
+				var isDialyse = gkvAbrechnung.InvoiceBases.All(ib => ib.InvoiceId == "RechnungHaeuslicheKrankenpflege");
+				var leistungsbereich = isDialyse
+					? SchlüsselLeistungserbringerSammelgruppenschlussel.NichtÄrztlicheDialysesachleistung
+					: SchlüsselLeistungserbringerSammelgruppenschlussel.SoziotherapeutischerLeistungserbringer;
+				var manager = new DakotaManager(DateTime.Now.Month, DateTime.Now, leistungsbereich);
 				var mandatordc = new OperationsServiceImp().GetMandator();
 
 				eval(GkvValidation.ValidateMandator(mandatordc));