diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor b/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor
index 24899fee..dc4f8149 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor	
+++ b/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor	
@@ -1,7 +1,7 @@
 @inherits ConfigurationBase
 
-<MudField Label="@this.OptionDescription" Variant="Variant.Outlined" HelperText="@this.OptionHelp" Class="@MARGIN_CLASS">
-    <MudSwitch T="bool" Value="@this.State()" ValueChanged="@(updatedState => this.OptionChanged(updatedState))" Color="Color.Primary">
+<MudField Disabled="@this.Disabled()" Label="@this.OptionDescription" Variant="Variant.Outlined" HelperText="@this.OptionHelp" Class="@MARGIN_CLASS">
+    <MudSwitch T="bool" Disabled="@this.Disabled()" Value="@this.State()" ValueChanged="@(updatedState => this.OptionChanged(updatedState))" Color="Color.Primary">
         @(this.State() ? this.LabelOn : this.LabelOff)
     </MudSwitch>
 </MudField>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs b/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs
index 68d5cd4d..874fbd38 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs	
+++ b/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor.cs	
@@ -1,3 +1,5 @@
+using AIStudio.Tools;
+
 using Microsoft.AspNetCore.Components;
 
 namespace AIStudio.Components.Blocks;
@@ -5,7 +7,7 @@ namespace AIStudio.Components.Blocks;
 /// <summary>
 /// Configuration component for any boolean option.
 /// </summary>
-public partial class ConfigurationOption : ConfigurationBase
+public partial class ConfigurationOption : ConfigurationBase, IMessageBusReceiver
 {
     /// <summary>
     /// Text to display when the option is true.
@@ -30,6 +32,25 @@ public partial class ConfigurationOption : ConfigurationBase
     /// </summary>
     [Parameter]
     public Action<bool> StateUpdate { get; set; } = _ => { };
+
+    /// <summary>
+    /// Is the option disabled?
+    /// </summary>
+    [Parameter]
+    public Func<bool> Disabled { get; set; } = () => false;
+    
+    #region Overrides of ComponentBase
+
+    protected override async Task OnInitializedAsync()
+    {
+        // Register this component with the message bus:
+        this.MessageBus.RegisterComponent(this);
+        this.MessageBus.ApplyFilters(this, [], [ Event.CONFIGURATION_CHANGED ]);
+        
+        await base.OnInitializedAsync();
+    }
+
+    #endregion
     
     private async Task OptionChanged(bool updatedState)
     {
@@ -37,4 +58,25 @@ public partial class ConfigurationOption : ConfigurationBase
         await this.SettingsManager.StoreSettings();
         await this.InformAboutChange();
     }
+    
+    #region Implementation of IMessageBusReceiver
+
+    public Task ProcessMessage<TMsg>(ComponentBase? sendingComponent, Event triggeredEvent, TMsg? data)
+    {
+        switch (triggeredEvent)
+        {
+            case Event.CONFIGURATION_CHANGED:
+                this.StateHasChanged();
+                break;
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public Task<TResult?> ProcessMessageWithResult<TPayload, TResult>(ComponentBase? sendingComponent, Event triggeredEvent, TPayload? data)
+    {
+        return Task.FromResult<TResult?>(default);
+    }
+
+    #endregion
 }
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor b/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor
index 29dccb67..45e64119 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor	
+++ b/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor	
@@ -1 +1 @@
-<ConfigurationSelect OptionDescription="Preselected provider" OptionHelp="Select a provider that is preselected." Data="@this.Data" SelectedValue="@this.SelectedValue" SelectionUpdate="@this.SelectionUpdate"/>
\ No newline at end of file
+<ConfigurationSelect OptionDescription="Preselected provider" Disabled="@this.Disabled" OptionHelp="Select a provider that is preselected." Data="@this.Data" SelectedValue="@this.SelectedValue" SelectionUpdate="@this.SelectionUpdate"/>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs b/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs
index 8898c8bb..66a2efdd 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/Blocks/ConfigurationProviderSelection.razor.cs	
@@ -16,6 +16,12 @@ public partial class ConfigurationProviderSelection : ComponentBase, IMessageBus
     [Parameter]
     public IEnumerable<ConfigurationSelectData<string>> Data { get; set; } = new List<ConfigurationSelectData<string>>();
     
+    /// <summary>
+    /// Is the selection component disabled?
+    /// </summary>
+    [Parameter]
+    public Func<bool> Disabled { get; set; } = () => false;
+    
     [Inject]
     private SettingsManager SettingsManager { get; init; } = null!;
     
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor b/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor
index 3cae9b50..cc9ef065 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor	
+++ b/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor	
@@ -1,7 +1,7 @@
 @inherits ConfigurationBase
 @typeparam T
 
-<MudSelect T="T" Value="@this.SelectedValue()" Strict="@true" Margin="Margin.Dense" Label="@this.OptionDescription" Class="@GetClass" Variant="Variant.Outlined" HelperText="@this.OptionHelp" ValueChanged="selectedValue => this.OptionChanged(selectedValue)">
+<MudSelect T="T" Value="@this.SelectedValue()" Strict="@true" Disabled="@this.Disabled()" Margin="Margin.Dense" Label="@this.OptionDescription" Class="@GetClass" Variant="Variant.Outlined" HelperText="@this.OptionHelp" ValueChanged="selectedValue => this.OptionChanged(selectedValue)">
     @foreach (var data in this.Data)
     {
         <MudSelectItem Value="@data.Value">
diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs b/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs
index 4f0fe496..616a4864 100644
--- a/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs	
+++ b/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor.cs	
@@ -1,4 +1,5 @@
 using AIStudio.Settings;
+using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
@@ -8,7 +9,7 @@ namespace AIStudio.Components.Blocks;
 /// Configuration component for selecting a value from a list.
 /// </summary>
 /// <typeparam name="T">The type of the value to select.</typeparam>
-public partial class ConfigurationSelect<T> : ConfigurationBase
+public partial class ConfigurationSelect<T> : ConfigurationBase, IMessageBusReceiver
 {
     /// <summary>
     /// The data to select from.
@@ -28,6 +29,25 @@ public partial class ConfigurationSelect<T> : ConfigurationBase
     [Parameter]
     public Action<T> SelectionUpdate { get; set; } = _ => { };
     
+    /// <summary>
+    /// Is the selection component disabled?
+    /// </summary>
+    [Parameter]
+    public Func<bool> Disabled { get; set; } = () => false;
+
+    #region Overrides of ComponentBase
+
+    protected override async Task OnInitializedAsync()
+    {
+        // Register this component with the message bus:
+        this.MessageBus.RegisterComponent(this);
+        this.MessageBus.ApplyFilters(this, [], [ Event.CONFIGURATION_CHANGED ]);
+        
+        await base.OnInitializedAsync();
+    }
+
+    #endregion
+
     private async Task OptionChanged(T updatedValue)
     {
         this.SelectionUpdate(updatedValue);
@@ -36,4 +56,25 @@ public partial class ConfigurationSelect<T> : ConfigurationBase
     }
     
     private static string GetClass => $"{MARGIN_CLASS} rounded-lg";
+    
+    #region Implementation of IMessageBusReceiver
+
+    public Task ProcessMessage<TMsg>(ComponentBase? sendingComponent, Event triggeredEvent, TMsg? data)
+    {
+        switch (triggeredEvent)
+        {
+            case Event.CONFIGURATION_CHANGED:
+                this.StateHasChanged();
+                break;
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public Task<TResult?> ProcessMessageWithResult<TPayload, TResult>(ComponentBase? sendingComponent, Event triggeredEvent, TPayload? data)
+    {
+        return Task.FromResult<TResult?>(default);
+    }
+
+    #endregion
 }
\ No newline at end of file