diff --git a/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
index 79ac68c45..0d2d6b576 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinPromptView.xaml
@@ -72,8 +72,13 @@
                 IsEnabled="{Binding ViewModel.CanEdit}"
                 Style="{StaticResource TextBoxNoticeLarge}"
                 Text="{Binding ViewModel.Prompt, UpdateSourceTrigger=PropertyChanged}"
-                TextWrapping="Wrap" />
-
+                TextWrapping="Wrap" Visibility="{Binding ViewModel.IsPromptVisible, Converter={StaticResource BoolVisibilityConverter}}" />
+            <Label Grid.Row="2"
+Grid.Column="2" Foreground="DarkGray" FontSize="10" 
+                   Visibility="{Binding ViewModel.IsPromptVisible, Converter={StaticResource BoolVisibilityConverter}, ConverterParameter=Reverse}">
+                nicht sichtbar
+            </Label>
+            
             <Label
                 Grid.Row="3"
                 Grid.Column="0"
diff --git a/BeWo/ViewModel/AiPromptbausteinPromptVM.cs b/BeWo/ViewModel/AiPromptbausteinPromptVM.cs
index 41c85ef53..9a935c4cc 100644
--- a/BeWo/ViewModel/AiPromptbausteinPromptVM.cs
+++ b/BeWo/ViewModel/AiPromptbausteinPromptVM.cs
@@ -73,13 +73,13 @@ namespace BeWo.ViewModel
 		public bool ShowPrompt
 		{
 			get => _ShowPrompt;
-			set => SetProperty(ref _ShowPrompt, value, nameof(ShowPrompt), () => DataContract.ShowPrompt);
+			set => SetProperty(ref _ShowPrompt, value, nameof(ShowPrompt), () => DataContract.ShowPrompt, nameof(IsPromptVisible));
 		}
 
 		public bool ShowPromptByTenant
 		{
 			get => _ShowPromptByTenant;
-			set => SetProperty(ref _ShowPromptByTenant, value, nameof(ShowPromptByTenant), () => DataContract.ShowPromptByTenant);
+			set => SetProperty(ref _ShowPromptByTenant, value, nameof(ShowPromptByTenant), () => DataContract.ShowPromptByTenant, nameof(IsPromptVisible));
 		}
 
 		public bool IsOwnsoftPrompt
@@ -103,12 +103,7 @@ namespace BeWo.ViewModel
 		public bool IsFavorite
 		{
 			get => _IsFavorite;
-			set
-			{
-				var success = SetProperty(ref _IsFavorite, value, nameof(IsFavorite), () => DataContract.IsFavorite);
-				if (success)
-					FirePropertyChanged(nameof(FontWeight));
-			}
+			set => SetProperty(ref _IsFavorite, value, nameof(IsFavorite), () => DataContract.IsFavorite, nameof(FontWeight));
 		}
 
 		public bool CanShareEdit
@@ -125,12 +120,7 @@ namespace BeWo.ViewModel
 		public bool IsSelected
 		{
 			get => _IsSelected;
-			set
-			{
-				var success = SetProperty(ref _IsSelected, value, nameof(IsSelected));
-				if (success)
-					FirePropertyChanged(nameof(IsInfoVisible));
-			}
+			set => SetProperty(ref _IsSelected, value, nameof(IsSelected), nameof(IsInfoVisible));
 		}
 
 		public bool IsInfoVisible
@@ -143,6 +133,11 @@ namespace BeWo.ViewModel
 			get => IsFavorite ? FontWeights.Bold : FontWeights.Medium;
 		}
 
+		public bool IsPromptVisible
+		{
+			get => ShowPrompt && ShowPromptByTenant;
+		}
+
 		protected override void InitByDataContract(AiPromptbausteinPromptDC pDataContract)
 		{
 			_Title = pDataContract.Title;
diff --git a/Data/Entities/AiPromptbausteinPrompt.cs b/Data/Entities/AiPromptbausteinPrompt.cs
index c80786489..d68ec1f53 100644
--- a/Data/Entities/AiPromptbausteinPrompt.cs
+++ b/Data/Entities/AiPromptbausteinPrompt.cs
@@ -72,7 +72,9 @@ namespace BeWo.Data.Entities
 				x.OwnsoftRefLink == ent.OwnsoftRefLink &&
 				x.Prompt == ent.Prompt &&
 				x.ActionType == ent.ActionType &&
-				x.SamplesCount == ent.SamplesCount;
+				x.SamplesCount == ent.SamplesCount &&
+				x.ShowPrompt == ent.ShowPrompt &&
+				x.ShowPromptByTenant == ent.ShowPromptByTenant;
 		}
 
 		public int GetHashCode(AiPromptbausteinPrompt obj)
diff --git a/Server/Components/AICore/Facade/AiPromptsApiClient.cs b/Server/Components/AICore/Facade/AiPromptsApiClient.cs
index bf7993258..6fdd46d7f 100644
--- a/Server/Components/AICore/Facade/AiPromptsApiClient.cs
+++ b/Server/Components/AICore/Facade/AiPromptsApiClient.cs
@@ -46,7 +46,8 @@ namespace AICore.Facade
 					description = "",
 					helpurl = "",
 					aiactiontype = "",
-					samples_count = 0
+					samples_count = 0,
+					show_prompt = true
 				}
 			};
 
@@ -71,6 +72,8 @@ namespace AICore.Facade
 				IsOwnsoftPrompt = true,
 				ActionType = GetAiActionType(x.aiactiontype, aiActionType),
 				SamplesCount = x.samples_count,
+				ShowPromptByTenant = true,
+				ShowPrompt = x.show_prompt
 			});
 
 			var log_str = string.Join("", data.Select(x => $"\r\n\t\t\t\t- ('{x.PromptId}','{x.Title}','{x.ActionType}')"));