diff --git a/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor b/app/MindWork AI Studio/Components/Blocks/ConfigurationOption.razor
index dc4f8149..73ffe235 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 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">
+    <MudSwitch T="bool" Disabled="@this.Disabled()" Value="@this.State()" ValueChanged="@this.OptionChanged" 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/ConfigurationSelect.razor b/app/MindWork AI Studio/Components/Blocks/ConfigurationSelect.razor
index cc9ef065..b98aea66 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" Disabled="@this.Disabled()" 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="@this.OptionChanged">
     @foreach (var data in this.Data)
     {
         <MudSelectItem Value="@data.Value">