diff --git a/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs b/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs
index 5715d52f..0727092f 100644
--- a/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs	
+++ b/app/MindWork AI Studio/Components/DataSourceSelection.razor.cs	
@@ -65,7 +65,7 @@ public partial class DataSourceSelection : MSGComponentBase
         this.aiBasedSourceSelection = this.DataSourceOptions.AutomaticDataSourceSelection;
         this.aiBasedValidation = this.DataSourceOptions.AutomaticValidation;
         this.areDataSourcesEnabled = !this.DataSourceOptions.DisableDataSources;
-        this.waitingForDataSources = this.areDataSourcesEnabled;
+        this.waitingForDataSources = this.areDataSourcesEnabled && this.SelectionMode is not DataSourceSelectionMode.CONFIGURATION_MODE;
 
         //
         // Preselect the data sources. Right now, we cannot filter
@@ -181,7 +181,10 @@ public partial class DataSourceSelection : MSGComponentBase
     {
         if(this.DataSourceOptions.DisableDataSources)
             return;
-        
+
+        if(this.SelectionMode is DataSourceSelectionMode.CONFIGURATION_MODE)
+            return;
+
         this.waitingForDataSources = true;
         this.StateHasChanged();
             
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.55.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.55.md
index 7fde6291..7f29c973 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.55.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.55.md	
@@ -17,4 +17,5 @@
 - Fixed a bug in the local data sources info dialog (preview feature) for data directories that could cause the app to crash. The error was caused by a background thread producing data while the frontend attempted to display it.
 - Fixed a visual bug where a function's preview status was misaligned. You might have seen it in document analysis or the ERI server assistant.
 - Fixed a rare bug in the Microsoft Word export for huge documents.
+- Fixed a bug in the chat options that occurred when selecting default data sources. Under certain conditions, selecting data sources caused an error that required restarting the app. This preview-only feature (RAG preview) had not been released yet.
 - Upgraded dependencies such as Rust, MudBlazor, and others.
\ No newline at end of file