diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
index 29abb80b6..398c8edf3 100644
--- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
+++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
@@ -5088,9 +5088,12 @@ namespace BeWo.View.Detail.Zeiterfassung
         {
 			var records = GetVisibleRecordVMs();
 			var context = ViewModel.GetVisibleInformationReferences(records);
-			var oid = supportConceptSelectionControl.SelectedItem.SupportConceptTreeNodeDC.SupportConcept.SupportConceptOid;
+			var oid = supportConceptSelectionControl.SelectedItem.SupportConceptTreeNodeDC?.SupportConcept.SupportConceptOid;
 
-            var dc = new AiViewContextDC()
+            if (!chkWithClient.IsChecked.Value)
+                oid = null;
+
+			var dc = new AiViewContextDC()
             {
                 Primary = oid,
                 References = context