diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 4b77c534..a5626a5d 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -319,7 +319,7 @@
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="rendermode" HelpText="The default render mode for the site" ResourceKey="Rendermode">Render Mode: </Label>
                         <div class="col-sm-9">
-                            <select id="rendermode" class="form-select" @bind="@_rendermode" required>
+                            <select id="rendermode" class="form-select" value="@_rendermode" @onchange="(e => RenderModeChanged(e))" required>
                                 <option value="@RenderModes.Interactive">@(SharedLocalizer["RenderMode" + @RenderModes.Interactive])</option>
                                 <option value="@RenderModes.Static">@(SharedLocalizer["RenderMode" + @RenderModes.Static])</option>
                                 <option value="@RenderModes.Headless">@(SharedLocalizer["RenderMode" + @RenderModes.Headless])</option>
@@ -337,11 +337,11 @@
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="prerender" HelpText="Specifies if interactive components should prerender their output. The default is Auto which determines if a component should be prerendered at runtime based on the environment." ResourceKey="Prerender">Prerendering: </Label>
+                        <Label Class="col-sm-3" For="prerender" HelpText="Specifies if interactive components should prerender their output on the server" ResourceKey="Prerender">Prerender: </Label>
                         <div class="col-sm-9">
                             <select id="prerender" class="form-select" @bind="@_prerender" required>
-                                <option value="True">@SharedLocalizer["Auto"]</option>
-                                <option value="False">@SharedLocalizer["Disabled"]</option>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
                             </select>
                         </div>
                     </div>
@@ -572,6 +572,23 @@
         }
     }
 
+    private void RenderModeChanged(ChangeEventArgs e)
+    {
+        _rendermode = (string)e.Value;
+        switch (_rendermode)
+        {
+            case RenderModes.Interactive:
+                _prerender = "True";
+                break;
+            case RenderModes.Static:
+                _prerender = "False";
+                break;
+            case RenderModes.Headless:
+                _prerender = "False";
+                break;
+        }
+    }
+
     private async Task SaveSite()
     {
         validated = true;
diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index 45f3d029..babf23e0 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -277,10 +277,10 @@
     <value>UI Component Settings</value>
   </data>
   <data name="Prerender.HelpText" xml:space="preserve">
-    <value>Specifies if interactive components should prerender their output. The default is Auto which determines if a component should be prerendered at runtime based on the environment.</value>
+    <value>Specifies if interactive components should prerender their output on the server</value>
   </data>
   <data name="Prerender.Text" xml:space="preserve">
-    <value>Prerendering: </value>
+    <value>Prerender: </value>
   </data>
   <data name="RenderMode.HelpText" xml:space="preserve">
     <value>The default render mode for the site</value>
diff --git a/Oqtane.Client/Resources/SharedResources.resx b/Oqtane.Client/Resources/SharedResources.resx
index a07d7295..4161d868 100644
--- a/Oqtane.Client/Resources/SharedResources.resx
+++ b/Oqtane.Client/Resources/SharedResources.resx
@@ -453,9 +453,6 @@
   <data name="RenderModeStatic" xml:space="preserve">
     <value>Static</value>
   </data>
-  <data name="Auto" xml:space="preserve">
-    <value>Auto</value>
-  </data>
   <data name="Disabled" xml:space="preserve">
     <value>Disabled</value>
   </data>
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index f501523d..8dfec04b 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -29,7 +29,7 @@
 
     protected override void OnParametersSet()
     {
-        _prerender = ModuleState.Prerender ?? (PageState.Site.Prerender && PageState.User == null);
+        _prerender = ModuleState.Prerender ?? PageState.Site.Prerender;
         _comment = "<!-- rendermode: ";
         if (PageState.RenderMode == RenderModes.Static && ModuleState.RenderMode == RenderModes.Static)
         {
diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor
index 61aad936..541d08e4 100644
--- a/Oqtane.Server/Components/App.razor
+++ b/Oqtane.Server/Components/App.razor
@@ -139,7 +139,7 @@
                 {
                     _renderMode = site.RenderMode;
                     _runtime = site.Runtime;
-                    _prerender = site.Prerender && !Context.User.Identity.IsAuthenticated;
+                    _prerender = site.Prerender;
 
                     Route route = new Route(url, alias.Path);
                     var page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index 043d7aa2..ad472f37 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -539,6 +539,8 @@ namespace Oqtane.Infrastructure
                             var identityUserManager = scope.ServiceProvider.GetRequiredService<UserManager<IdentityUser>>();
 
                             var tenant = tenants.GetTenants().FirstOrDefault(item => item.Name == install.TenantName);
+                            var rendermode = (!string.IsNullOrEmpty(install.RenderMode)) ? install.RenderMode : _configManager.GetSection("RenderMode").Value;
+                            var runtime = (!string.IsNullOrEmpty(install.Runtime)) ? install.Runtime : _configManager.GetSection("Runtime").Value;
 
                             site = new Site
                             {
@@ -556,9 +558,9 @@ namespace Oqtane.Infrastructure
                                 DefaultContainerType = (!string.IsNullOrEmpty(install.DefaultContainer)) ? install.DefaultContainer : Constants.DefaultContainer,
                                 AdminContainerType = (!string.IsNullOrEmpty(install.DefaultAdminContainer)) ? install.DefaultAdminContainer : Constants.DefaultAdminContainer,
                                 SiteTemplateType = install.SiteTemplate,
-                                RenderMode = (!string.IsNullOrEmpty(install.RenderMode)) ? install.RenderMode : _configManager.GetSection("RenderMode").Value,
-                                Runtime = (!string.IsNullOrEmpty(install.Runtime)) ? install.Runtime : _configManager.GetSection("Runtime").Value,
-                                Prerender = true,
+                                RenderMode = rendermode,
+                                Runtime = runtime,
+                                Prerender = (rendermode == RenderModes.Interactive),
                                 Hybrid = false
                             };
                             site = sites.AddSite(site);