diff --git a/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor b/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor
index 56d2b73c..c20f3ae8 100644
--- a/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor	
+++ b/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor	
@@ -30,7 +30,14 @@
     automatically saved. Would you like this?
 </MudText>
 
-<MudTextSwitch Label="Should we automatically save any input made?" @bind-Value="@this.autoSave" LabelOn="Yes, please save my inputs" LabelOff="No, I will enter everything again or configure it manually in the settings" />
+@if(!this.SettingsManager.ConfigurationData.ERI.PreselectOptions)
+{
+    <MudText Typo="Typo.body1" Class="mb-3">
+        Hint: to allow this assistant to automatically save your changes, you must enable the preselection of values in the settings.
+    </MudText>
+}
+
+<MudTextSwitch Label="Should we automatically save any input made?" Disabled="@(!this.SettingsManager.ConfigurationData.ERI.PreselectOptions)" @bind-Value="@this.autoSave" LabelOn="Yes, please save my inputs" LabelOff="No, I will enter everything again or configure it manually in the settings" />
 
 <MudText Typo="Typo.h4" Class="mt-6 mb-1">
     Common ERI server settings
diff --git a/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs b/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs
index be58155f..bf95b5b4 100644
--- a/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/ERI/AssistantERI.razor.cs	
@@ -108,7 +108,7 @@ public partial class AssistantERI : AssistantBaseCore
 
     private async Task AutoSave()
     {
-        if(!this.autoSave)
+        if(!this.autoSave || !this.SettingsManager.ConfigurationData.ERI.PreselectOptions)
             return;
         
         this.SettingsManager.ConfigurationData.ERI.PreselectedServerName = this.serverName;