diff --git a/BeWo/ViewModel/ListViewModel/AiConversationMessageListVM.cs b/BeWo/ViewModel/ListViewModel/AiConversationMessageListVM.cs
index bf2d721b8..08d3b0f3c 100644
--- a/BeWo/ViewModel/ListViewModel/AiConversationMessageListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/AiConversationMessageListVM.cs
@@ -33,7 +33,9 @@ namespace BeWo.ViewModel.ListViewModel
 
 		private void Item_PropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-			if (e.PropertyName == nameof(AiConversationMessageVM.IsChecked))
+			if (e.PropertyName == nameof(AiConversationMessageVM.IsChecked) 
+				&& sender is AiConversationMessageVM vm 
+				&& vm.Role == BS.Shared.AiConversationMessageRole.Assistent)
 			{
 				var changedItem = (AiConversationMessageVM)sender;
 				int index = VMList.IndexOf(changedItem);
@@ -46,7 +48,7 @@ namespace BeWo.ViewModel.ListViewModel
 				}
 				else
 				{
-					for (int i = index; i < VMList.Count; i++)
+					for (int i = index - 1; i < VMList.Count; i++)
 						if (VMList[i].IsChecked) 
 							VMList[i].IsChecked = false;
 				}
diff --git a/Service/ServiceImplementations/AiEnhancedServiceImp.cs b/Service/ServiceImplementations/AiEnhancedServiceImp.cs
index aaf17279e..ec7cc592b 100644
--- a/Service/ServiceImplementations/AiEnhancedServiceImp.cs
+++ b/Service/ServiceImplementations/AiEnhancedServiceImp.cs
@@ -168,6 +168,9 @@ namespace BeWo.Service.ServiceImplementations
 			clone_conv.Updated = DateTime.Now;
 			clone_conv.ApplicationUserOid = parent_conv.ApplicationUserOid;
 
+			if (last_message_oid is null)
+				last_message_oid = parent_conv.Messages[0].Oid;
+
 			foreach (var msg in parent_conv.Messages)
 			{
 				var clone_msg = new AiConversationMessage();