diff --git a/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs b/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs
index 0727092f..eeb340c5 100644
--- a/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs	
@@ -94,6 +94,7 @@ public partial class DataSourceSelection : MSGComponentBase
             this.aiBasedSourceSelection = this.DataSourceOptions.AutomaticDataSourceSelection;
             this.aiBasedValidation = this.DataSourceOptions.AutomaticValidation;
             this.areDataSourcesEnabled = !this.DataSourceOptions.DisableDataSources;
+            this.selectedDataSources = this.SettingsManager.ConfigurationData.DataSources.Where(ds => this.DataSourceOptions.PreselectedDataSourceIds.Contains(ds.Id)).ToList();
         }
 
         switch (this.SelectionMode)
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v26.6.3.md b/app/MindWork AI Studio/wwwroot/changelog/v26.6.3.md
index 7a923be1..ee4c2bd0 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v26.6.3.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v26.6.3.md	
@@ -8,4 +8,5 @@
 - Improved the chat experience by automatically focusing the message composer again when it becomes available. Thanks, Dominic Neuburg (`donework`), for the contribution.
 - Improved the chat message formatting so line breaks in responses are preserved more closely, making structured text easier to read. Thanks, Dominic Neuburg (`donework`), for the contribution.
 - Fixed configuration plugins so they can configure assistant plugin audit settings, including required audit levels, audit provider selection, and automatic background audits.
+- Fixed default data source selection so sources that require local or trusted providers are selected again after switching from a cloud provider to a suitable provider.
 - Upgraded Rust to v1.96.1
\ No newline at end of file