diff --git a/app/MindWork AI Studio/Assistants/Dynamic/AssistantDynamic.razor b/app/MindWork AI Studio/Assistants/Dynamic/AssistantDynamic.razor
index 11f1d165..cacd77d2 100644
--- a/app/MindWork AI Studio/Assistants/Dynamic/AssistantDynamic.razor	
+++ b/app/MindWork AI Studio/Assistants/Dynamic/AssistantDynamic.razor	
@@ -5,9 +5,18 @@
 @using AIStudio.Tools.PluginSystem.Assistants.DataModel.Layout
 @inherits AssistantBaseCore<AIStudio.Dialogs.Settings.SettingsDialogDynamic>
 
-@foreach (var component in this.RootComponent!.Children)
+@if (this.RootComponent is null)
 {
-    @this.RenderComponent(component)
+    <MudAlert Severity="Severity.Warning">
+        @this.T("No assistant plugin are currently installed.")
+    </MudAlert>
+}
+else
+{
+    @foreach (var component in this.RootComponent.Children)
+    {
+        @this.RenderComponent(component)
+    }
 }
 
 @code {
diff --git a/app/MindWork AI Studio/Assistants/Dynamic/AssistantDynamic.razor.cs b/app/MindWork AI Studio/Assistants/Dynamic/AssistantDynamic.razor.cs
index 8d333f8c..fa193f4f 100644
--- a/app/MindWork AI Studio/Assistants/Dynamic/AssistantDynamic.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Dynamic/AssistantDynamic.razor.cs	
@@ -30,14 +30,11 @@ public partial class AssistantDynamic : AssistantBaseCore<SettingsDialogDynamic>
     // Reuse chat-level provider filtering/preselection instead of NONE.
     protected override Tools.Components Component => Tools.Components.CHAT;
 
-    private string? inputText;
     private string title = string.Empty;
     private string description = string.Empty;
     private string systemPrompt = string.Empty;
     private bool allowProfiles = true;
     private string submitText = string.Empty;
-    private string selectedTargetLanguage = string.Empty;
-    private string customTargetLanguage = string.Empty;
     private bool showFooterProfileSelection = true;
     private PluginAssistants? assistantPlugin;
     
@@ -86,7 +83,9 @@ public partial class AssistantDynamic : AssistantBaseCore<SettingsDialogDynamic>
 
     private PluginAssistants? ResolveAssistantPlugin()
     {
-        var assistantPlugins = PluginFactory.RunningPlugins.OfType<PluginAssistants>().ToList();
+        var assistantPlugins = PluginFactory.RunningPlugins.OfType<PluginAssistants>()
+            .Where(plugin => this.SettingsManager.IsPluginEnabled(plugin))
+            .ToList();
         if (assistantPlugins.Count == 0)
             return null;
 
diff --git a/app/MindWork AI Studio/Assistants/I18N/allTexts.lua b/app/MindWork AI Studio/Assistants/I18N/allTexts.lua
index b4fbb646..eb53ac38 100644
--- a/app/MindWork AI Studio/Assistants/I18N/allTexts.lua	
+++ b/app/MindWork AI Studio/Assistants/I18N/allTexts.lua	
@@ -535,6 +535,9 @@ UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DOCUMENTANALYSIS::DOCUMENTANALYSISASSISTA
 -- Yes, hide the policy definition
 UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DOCUMENTANALYSIS::DOCUMENTANALYSISASSISTANT::T940701960"] = "Yes, hide the policy definition"
 
+-- No assistant plugin are currently installed.
+UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DYNAMIC::ASSISTANTDYNAMIC::T1913566603"] = "No assistant plugin are currently installed."
+
 -- Please select one of your profiles.
 UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DYNAMIC::ASSISTANTDYNAMIC::T465395981"] = "Please select one of your profiles."
 
diff --git a/app/MindWork AI Studio/Plugins/languages/de-de-43065dbc-78d0-45b7-92be-f14c2926e2dc/plugin.lua b/app/MindWork AI Studio/Plugins/languages/de-de-43065dbc-78d0-45b7-92be-f14c2926e2dc/plugin.lua
index bcf13dbc..3afbf26f 100644
--- a/app/MindWork AI Studio/Plugins/languages/de-de-43065dbc-78d0-45b7-92be-f14c2926e2dc/plugin.lua	
+++ b/app/MindWork AI Studio/Plugins/languages/de-de-43065dbc-78d0-45b7-92be-f14c2926e2dc/plugin.lua	
@@ -537,6 +537,9 @@ UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DOCUMENTANALYSIS::DOCUMENTANALYSISASSISTA
 -- Yes, hide the policy definition
 UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DOCUMENTANALYSIS::DOCUMENTANALYSISASSISTANT::T940701960"] = "Ja, die Definition des Regelwerks ausblenden"
 
+-- No assistant plugin are currently installed.
+UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DYNAMIC::ASSISTANTDYNAMIC::T1913566603"] = "Derzeit sind keine Assistant-Plugins installiert."
+
 -- Please select one of your profiles.
 UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DYNAMIC::ASSISTANTDYNAMIC::T465395981"] = "Bitte wählen Sie eines Ihrer Profile aus."
 
diff --git a/app/MindWork AI Studio/Plugins/languages/en-us-97dfb1ba-50c4-4440-8dfa-6575daf543c8/plugin.lua b/app/MindWork AI Studio/Plugins/languages/en-us-97dfb1ba-50c4-4440-8dfa-6575daf543c8/plugin.lua
index 7fc08475..aa703185 100644
--- a/app/MindWork AI Studio/Plugins/languages/en-us-97dfb1ba-50c4-4440-8dfa-6575daf543c8/plugin.lua	
+++ b/app/MindWork AI Studio/Plugins/languages/en-us-97dfb1ba-50c4-4440-8dfa-6575daf543c8/plugin.lua	
@@ -537,6 +537,9 @@ UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DOCUMENTANALYSIS::DOCUMENTANALYSISASSISTA
 -- Yes, hide the policy definition
 UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DOCUMENTANALYSIS::DOCUMENTANALYSISASSISTANT::T940701960"] = "Yes, hide the policy definition"
 
+-- No assistant plugin are currently installed.
+UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DYNAMIC::ASSISTANTDYNAMIC::T1913566603"] = "No assistant plugin are currently installed."
+
 -- Please select one of your profiles.
 UI_TEXT_CONTENT["AISTUDIO::ASSISTANTS::DYNAMIC::ASSISTANTDYNAMIC::T465395981"] = "Please select one of your profiles."
 
diff --git a/app/MindWork AI Studio/Tools/PluginSystem/Assistants/PluginAssistants.cs b/app/MindWork AI Studio/Tools/PluginSystem/Assistants/PluginAssistants.cs
index 9b0c10db..1df3bc69 100644
--- a/app/MindWork AI Studio/Tools/PluginSystem/Assistants/PluginAssistants.cs	
+++ b/app/MindWork AI Studio/Tools/PluginSystem/Assistants/PluginAssistants.cs	
@@ -370,6 +370,12 @@ public sealed class PluginAssistants(bool isInternal, LuaState state, PluginType
             result = action;
             return true;
         }
+        
+        if (type == AssistantComponentType.SWITCH && key == "OnChanged" && val.TryRead<LuaFunction>(out var onChanged))
+        {
+            result = onChanged;
+            return true;
+        }
 
         return this.TryConvertLuaValue(val, out result);
     }