diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 62fa5fc0..44e0234c 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -336,7 +336,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" value="@_rendermode" @onchange="(e => RenderModeChanged(e))" required>
+                            <select id="rendermode" class="form-select" @bind="@_rendermode" 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>
@@ -598,23 +598,6 @@
         }
     }
 
-    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.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index ad472f37..fca34c38 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -560,7 +560,7 @@ namespace Oqtane.Infrastructure
                                 SiteTemplateType = install.SiteTemplate,
                                 RenderMode = rendermode,
                                 Runtime = runtime,
-                                Prerender = (rendermode == RenderModes.Interactive),
+                                Prerender = true,
                                 Hybrid = false
                             };
                             site = sites.AddSite(site);