diff --git a/app/MindWork AI Studio/Components/DataSourceSelection.razor b/app/MindWork AI Studio/Components/DataSourceSelection.razor
index 145a3f6a..ac8acf6d 100644
--- a/app/MindWork AI Studio/Components/DataSourceSelection.razor	
+++ b/app/MindWork AI Studio/Components/DataSourceSelection.razor	
@@ -37,6 +37,26 @@
                         <MudSkeleton Width="80%"/>
                         <MudSkeleton Width="100%"/>
                     }
+                    else if (this.SettingsManager.ConfigurationData.DataSources.Count == 0)
+                    {
+                        <MudJustifiedText Typo="Typo.body1" Class="mb-3">
+                            You haven't configured any data sources. To grant the AI access to your data, you need to
+                            add such a source. However, if you wish to use data from your device, you first have to set up
+                            a so-called embedding. This embedding is necessary so the AI can effectively search your data,
+                            find and retrieve the correct information required for each task. In addition to local data,
+                            you can also incorporate your company's data. To do so, your company must provide the data through
+                            an ERI (External Retrieval Interface).
+                        </MudJustifiedText>
+                        
+                        <MudStack StretchItems="StretchItems.None" AlignItems="AlignItems.Start">
+                            <MudButton Variant="Variant.Filled" OnClick="this.OpenSettingsDialog" StartIcon="@Icons.Material.Filled.Settings">
+                                Manage Data Sources
+                            </MudButton>
+                            <MudButton Variant="Variant.Filled" Href="https://mindworkai.org/#eri---external-retrieval-interface" Target="_blank" StartIcon="@Icons.Material.Filled.Settings">
+                                Read more about ERI
+                            </MudButton>
+                        </MudStack>
+                    }
                     else if (this.showDataSourceSelection)
                     {
                         <MudTextSwitch Label="Are data sources enabled?" Value="@this.areDataSourcesEnabled" LabelOn="Yes, I want to use data sources." LabelOff="No, I don't want to use data sources." ValueChanged="@this.EnabledChanged"/>
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.37.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.37.md
index 51168ef8..54de8040 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.37.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.37.md	
@@ -1,2 +1,3 @@
 # v0.9.37, build 212 (2025-03-16 xx:xx UTC)
+- Improved the experience of the data selection component when no data sources are configured yet.
 - Moved the data source settings into the data selection component.
\ No newline at end of file