diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index aa3caa743..09ca5b00b 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -2435,11 +2435,6 @@ namespace BeWoPlanerMobil.Controllers
 
             Model.NewServiceRecord = new ServiceRecordDC();
 
-
-
-
-
-
             if(newResult?.Message != null)
             {
                 TempData[TempDataServiceRecordValidationKey] = newResult;
@@ -2480,15 +2475,6 @@ namespace BeWoPlanerMobil.Controllers
                 Model.SelectedServiceRecord.DistanceInMeterDecimal = distanceInMeters;
             }
 
-            // Warum wird das alles abgefragt?
-            /*
-             if(decimal.TryParse(durationRaw, out var duration) && 
-               Model.SelectedServiceRecord != null && 
-               Model.SelectedServiceRecord.Start.HasValue && 
-               Model.SelectedServiceRecord.End.HasValue && 
-               (Model.SelectedServiceRecord.End-Model.SelectedServiceRecord.Start).Value.TotalMinutes > 0 &&
-               Model.SelectedServiceRecord.RoundedDuration == 0)
-             */
             if(decimal.TryParse(durationRaw, out var duration) && 
                Model.SelectedServiceRecord != null &&
                Model.SelectedServiceRecord.RoundedDuration == 0)
@@ -2930,6 +2916,11 @@ namespace BeWoPlanerMobil.Controllers
 
             var firstServiceDescription = serviceDescriptions.First();
 
+            if(serviceDescriptions.Any(a => a.ServiceDescriptionOid.HasValue && Model.SelectedServiceDescriptionOid.HasValue && a.ServiceDescriptionOid.Value.Equals(Model.SelectedServiceDescriptionOid)))
+            {
+                return;
+            }
+
             Model.SelectedServiceDescriptionOid = firstServiceDescription.ServiceDescriptionOid;
             Model.SelectedServiceCategoryOid = firstServiceDescription.Category.ServiceCategoryOid;
         }