diff --git a/app/MindWork AI Studio/Pages/Settings.razor b/app/MindWork AI Studio/Pages/Settings.razor
index f8d90501..34a8a186 100644
--- a/app/MindWork AI Studio/Pages/Settings.razor	
+++ b/app/MindWork AI Studio/Pages/Settings.razor	
@@ -1,5 +1,6 @@
 @attribute [Route(Routes.SETTINGS)]
 @using AIStudio.Components.Settings
+@using AIStudio.Settings.DataModel
 
 <div class="inner-scrolling-context">
     <MudText Typo="Typo.h3" Class="mb-12">Settings</MudText>
@@ -7,8 +8,12 @@
     <InnerScrolling>
         <MudExpansionPanels Class="mb-3" MultiExpansion="@false">
             <SettingsPanelProviders @bind-AvailableLLMProviders="@this.availableLLMProviders" />
-            <SettingsPanelEmbeddings AvailableLLMProvidersFunc="() => this.availableLLMProviders" @bind-AvailableEmbeddingProviders="@this.availableEmbeddingProviders" />
-            <SettingsPanelDataSources AvailableLLMProvidersFunc="() => this.availableLLMProviders" AvailableEmbeddingsFunc="() => this.availableEmbeddingProviders" @bind-AvailableDataSources="@this.availableDataSources" />
+            
+            @if (PreviewFeatures.PRE_RAG_2024.IsEnabled(this.SettingsManager))
+            {
+                <SettingsPanelEmbeddings AvailableLLMProvidersFunc="() => this.availableLLMProviders" @bind-AvailableEmbeddingProviders="@this.availableEmbeddingProviders"/>
+                <SettingsPanelDataSources AvailableLLMProvidersFunc="() => this.availableLLMProviders" AvailableEmbeddingsFunc="() => this.availableEmbeddingProviders" @bind-AvailableDataSources="@this.availableDataSources"/>
+            }
             <SettingsPanelProfiles AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
             <SettingsPanelApp AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
             <SettingsPanelChat AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
@@ -16,7 +21,12 @@
             <SettingsPanelIconFinder AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
             <SettingsPanelTranslation AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
             <SettingsPanelCoding AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
-            <SettingsPanelERIServer AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
+            
+            @if (PreviewFeatures.PRE_RAG_2024.IsEnabled(this.SettingsManager))
+            {
+                <SettingsPanelERIServer AvailableLLMProvidersFunc="() => this.availableLLMProviders"/>
+            }
+            
             <SettingsPanelTextSummarizer AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
             <SettingsPanelAgenda AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
             <SettingsPanelGrammarSpelling AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
@@ -27,7 +37,12 @@
             <SettingsPanelSynonyms AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
             <SettingsPanelMyTasks AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
             <SettingsPanelAssistantBias AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
-            <SettingsPanelAgentDataSourceSelection AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
+            
+            @if (PreviewFeatures.PRE_RAG_2024.IsEnabled(this.SettingsManager))
+            {
+                <SettingsPanelAgentDataSourceSelection AvailableLLMProvidersFunc="() => this.availableLLMProviders"/>
+            }
+            
             <SettingsPanelAgentContentCleaner AvailableLLMProvidersFunc="() => this.availableLLMProviders" />
         </MudExpansionPanels>
     </InnerScrolling>
diff --git a/app/MindWork AI Studio/Pages/Settings.razor.cs b/app/MindWork AI Studio/Pages/Settings.razor.cs
index 600f4e93..aaf55c85 100644
--- a/app/MindWork AI Studio/Pages/Settings.razor.cs	
+++ b/app/MindWork AI Studio/Pages/Settings.razor.cs	
@@ -6,6 +6,9 @@ namespace AIStudio.Pages;
 
 public partial class Settings : ComponentBase, IMessageBusReceiver, IDisposable
 {
+    [Inject]
+    private SettingsManager SettingsManager { get; init; } = null!;
+    
     [Inject]
     private MessageBus MessageBus { get; init; } = null!;