diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb
index f0a0123..2abe7d4 100644
--- a/app/DD-Record-Organiser/ClassControlValues.vb
+++ b/app/DD-Record-Organiser/ClassControlValues.vb
@@ -145,7 +145,7 @@ Public Class ClassControlValues
         Return missingValues.Distinct().ToList()
     End Function
 
-    Public Shared Sub LoadControlValues(RecordId As Integer, ParentRecordId As Integer, FormId As Integer, controls As Control.ControlCollection, Entity_ID As Integer)
+    Public Shared Sub LoadControlValues(RecordId As Integer, ParentRecordId As Integer, FormId As Integer, controls As Control.ControlCollection, Entity_ID As Integer, Optional isGroupbox As Boolean = False)
         Try
             Dim sw As New Stopwatch
             sw.Start()
@@ -161,9 +161,10 @@ Public Class ClassControlValues
 
             If controls.Count = 0 Then
                 ClassLogger.Add("the control-Collection in LoadControlValuesNeu is empty!", True)
-                ENTITY_RELOAD_AFT_CONTROL_LOAD = True
+                If (Not isGroupbox) Then
+                    ENTITY_RELOAD_AFT_CONTROL_LOAD = True
+                End If
                 Exit Sub
-
             End If
 
             ' Zuerst alle Controls leeren
@@ -191,7 +192,7 @@ Public Class ClassControlValues
                             Select row.Item("VALUE")).ToList()
                 If TypeOf control Is GroupBox Then
                     Dim groupbox As GroupBox = DirectCast(control, GroupBox)
-                    LoadControlValues(RecordId, ParentRecordId, FormId, groupbox.Controls, Entity_ID)
+                    LoadControlValues(RecordId, ParentRecordId, FormId, groupbox.Controls, Entity_ID, True)
                 Else
                     LoadControlValue(RecordId, ParentRecordId, ControlId, control, values, Entity_ID)
                 End If