diff --git a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
index 953f560b7..072292879 100644
--- a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
+++ b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
@@ -466,6 +466,7 @@ namespace BeWo.ViewModel.View.AI
 			dc.Prompt = message.Message;
 			dc.CanEdit = true;
 			dc.ActionType = AiActionType.ServiceRecordConversation;
+			dc.ShowPrompt = true;
 
 			SavePromptVM = new AiPromptbausteinPromptVM(dc);
 		}
diff --git a/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs b/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
index 4f2c9f177..213980d03 100644
--- a/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
+++ b/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
@@ -51,7 +51,8 @@ namespace BeWo.Service.DCEntityMapper
 			pEntity.Position = pDataContract.Position;
 			pEntity.Prompt = pDataContract.Prompt;
 			pEntity.ShowPrompt = pDataContract.ShowPrompt;
-			pEntity.ShowPromptByTenant = pDataContract.ShowPromptByTenant;
+			pEntity.ShowPromptByTenant = true;
+				//= pDataContract.ShowPromptByTenant;
 			pEntity.IsOwnsoftPrompt = pDataContract.IsOwnsoftPrompt;
 			pEntity.OwnsoftRefLink = pDataContract.OwnsoftRefLink;
 			pEntity.PromptId = pDataContract.PromptId;