diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor.cs b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor.cs
index 0aa3afd0..6ca2f6ca 100644
--- a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor.cs	
+++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor.cs	
@@ -105,7 +105,23 @@ public partial class SettingsPanelProviders : SettingsPanelBase
             this.SettingsManager.ConfigurationData.Providers.Remove(provider);
             await this.SettingsManager.StoreSettings();
         }
+        else
+        {
+            var issueDialogParameters = new DialogParameters
+            {
+                { "Message", $"Couldn't delete the provider '{provider.InstanceName}'. The issue: {deleteSecretResponse.Issue}. We can ignore this issue and delete the provider anyway. Do you want to ignore it and delete this provider?" },
+            };
         
+            var issueDialogReference = await this.DialogService.ShowAsync<ConfirmDialog>("Delete LLM Provider", issueDialogParameters, DialogOptions.FULLSCREEN);
+            var issueDialogResult = await issueDialogReference.Result;
+            if (issueDialogResult is null || issueDialogResult.Canceled)
+                return;
+            
+            // Case: The user wants to ignore the issue and delete the provider anyway:
+            this.SettingsManager.ConfigurationData.Providers.Remove(provider);
+            await this.SettingsManager.StoreSettings();
+        }
+
         await this.UpdateProviders();
         await this.MessageBus.SendMessage<bool>(this, Event.CONFIGURATION_CHANGED);
     }
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.39.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.39.md
index cf523eb1..1378a9ef 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.39.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.39.md	
@@ -5,6 +5,7 @@
 - Added the plugin overview page. This page shows all installed plugins and allows you to enable or disable them. It is only available when the plugin preview feature is enabled.
 - Added hot reloading for plugins. When any plugin is changed, the app will automatically reload the plugin without needing to restart the app.
 - Added an API for streaming arbitrary local files to the embedding process. Thanks Nils `nilskruthoff` for this great contribution.
+- Improved the provider deletion process: when there are issues, the user is notified and can choose to delete the provider anyway.
 - Changed the update notification to use the default notification system at the bottom instead of the custom alert bar at the top.
 - Fixed the preview tooltip component not showing the correct position when used inside a scrollable container.
 - Upgraded to Rust v1.86.0