diff --git a/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor b/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor
index a94b9ebd..aaf2cec7 100644
--- a/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor	
@@ -25,7 +25,7 @@
             
             @if (this.DataLLMProvider.IsAPIKeyNeeded(this.DataHost))
             {
-                <SecretInputField @bind-Secret="@this.dataAPIKey" Label="@this.APIKeyText" Validation="@this.providerValidation.ValidatingAPIKey"/>
+                <SecretInputField Secret="@this.dataAPIKey" SecretChanged="@this.OnAPIKeyChanged" Label="@this.APIKeyText" Validation="@this.providerValidation.ValidatingAPIKey"/>
             }
 
             @if (this.DataLLMProvider.IsHostnameNeeded())
diff --git a/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor.cs b/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor.cs
index d486714d..04284ada 100644
--- a/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor.cs	
@@ -240,6 +240,12 @@ public partial class EmbeddingProviderDialog : MSGComponentBase, ISecretId
     }
 
     private void Cancel() => this.MudDialog.Cancel();
+
+    private void OnAPIKeyChanged(string apiKey)
+    {
+        this.dataAPIKey = apiKey;
+        this.dataAPIKeyStorageIssue = string.Empty;
+    }
     
     private async Task ReloadModels()
     {
diff --git a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor
index dc92f441..b424202d 100644
--- a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor	
@@ -22,7 +22,7 @@
             
             @if (this.DataLLMProvider.IsAPIKeyNeeded(this.DataHost))
             {
-                <SecretInputField @bind-Secret="@this.dataAPIKey" Label="@this.APIKeyText" Validation="@this.providerValidation.ValidatingAPIKey"/>
+                <SecretInputField Secret="@this.dataAPIKey" SecretChanged="@this.OnAPIKeyChanged" Label="@this.APIKeyText" Validation="@this.providerValidation.ValidatingAPIKey"/>
             }
 
             @if (this.DataLLMProvider.IsHostnameNeeded())
diff --git a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs
index c37f69f7..bf348d55 100644
--- a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs	
@@ -254,6 +254,12 @@ public partial class ProviderDialog : MSGComponentBase, ISecretId
     }
 
     private void Cancel() => this.MudDialog.Cancel();
+
+    private void OnAPIKeyChanged(string apiKey)
+    {
+        this.dataAPIKey = apiKey;
+        this.dataAPIKeyStorageIssue = string.Empty;
+    }
     
     private async Task ReloadModels()
     {
diff --git a/app/MindWork AI Studio/Dialogs/TranscriptionProviderDialog.razor b/app/MindWork AI Studio/Dialogs/TranscriptionProviderDialog.razor
index 5c862365..0a2aa3bb 100644
--- a/app/MindWork AI Studio/Dialogs/TranscriptionProviderDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/TranscriptionProviderDialog.razor	
@@ -25,7 +25,7 @@
             
             @if (this.DataLLMProvider.IsAPIKeyNeeded(this.DataHost))
             {
-                <SecretInputField @bind-Secret="@this.dataAPIKey" Label="@this.APIKeyText" Validation="@this.providerValidation.ValidatingAPIKey"/>
+                <SecretInputField Secret="@this.dataAPIKey" SecretChanged="@this.OnAPIKeyChanged" Label="@this.APIKeyText" Validation="@this.providerValidation.ValidatingAPIKey"/>
             }
 
             @if (this.DataLLMProvider.IsHostnameNeeded())
diff --git a/app/MindWork AI Studio/Dialogs/TranscriptionProviderDialog.razor.cs b/app/MindWork AI Studio/Dialogs/TranscriptionProviderDialog.razor.cs
index 440ec691..fd89ef7a 100644
--- a/app/MindWork AI Studio/Dialogs/TranscriptionProviderDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/TranscriptionProviderDialog.razor.cs	
@@ -248,6 +248,12 @@ public partial class TranscriptionProviderDialog : MSGComponentBase, ISecretId
     }
 
     private void Cancel() => this.MudDialog.Cancel();
+
+    private void OnAPIKeyChanged(string apiKey)
+    {
+        this.dataAPIKey = apiKey;
+        this.dataAPIKeyStorageIssue = string.Empty;
+    }
     
     private async Task ReloadModels()
     {