diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 15a8f019..c741a252 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -228,6 +228,7 @@
                             <select id="runtime" class="form-select" @bind="@_runtime" required>
                                 <option value="Server">@SharedLocalizer["BlazorServer"]</option>
                                 <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
+                                <option value="Hybrid">@SharedLocalizer["BlazorHybrid"]</option>
                             </select>
                         </div>
                     </div>
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index 76967b40..a8b7d495 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -89,7 +89,8 @@ else
                     <select id="runtime" class="form-select" @bind="@_runtime" required>
                         <option value="Server">@SharedLocalizer["BlazorServer"]</option>
                         <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
-                    </select>
+						<option value="Hybrid">@SharedLocalizer["BlazorHybrid"]</option>
+					</select>
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
diff --git a/Oqtane.Client/Resources/SharedResources.resx b/Oqtane.Client/Resources/SharedResources.resx
index 33a57601..1ad5ffb5 100644
--- a/Oqtane.Client/Resources/SharedResources.resx
+++ b/Oqtane.Client/Resources/SharedResources.resx
@@ -318,6 +318,9 @@
   <data name="BlazorWebAssembly" xml:space="preserve">
     <value>Blazor WebAssembly</value>
   </data>
+  <data name="BlazorHybrid" xml:space="preserve">
+    <value>Blazor Hybrid</value>
+  </data>
   <data name="Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
diff --git a/Oqtane.Maui/Main.razor b/Oqtane.Maui/Main.razor
index 793eb8c9..2d6354bc 100644
--- a/Oqtane.Maui/Main.razor
+++ b/Oqtane.Maui/Main.razor
@@ -1,5 +1,3 @@
-@inherits ErrorBoundary
-
 <DynamicComponent Type="@ComponentType" Parameters="@Parameters"></DynamicComponent>
 
 @code {
@@ -11,16 +9,10 @@
 		Parameters = new Dictionary<string, object>();
 		Parameters.Add(new KeyValuePair<string, object>("AntiForgeryToken", ""));
 		Parameters.Add(new KeyValuePair<string, object>("Runtime", "Hybrid"));
-		Parameters.Add(new KeyValuePair<string, object>("RenderMode", "Hybrid"));
+		Parameters.Add(new KeyValuePair<string, object>("RenderMode", ""));
 		Parameters.Add(new KeyValuePair<string, object>("VisitorId", -1));
 		Parameters.Add(new KeyValuePair<string, object>("RemoteIPAddress", ""));
 		Parameters.Add(new KeyValuePair<string, object>("AuthorizationToken", ""));
 	}
-
-	protected override async Task OnErrorAsync(Exception exception)
-	{
-		await base.OnErrorAsync(exception);
-		return;
-	}
 }
 
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index 17ffe457..e8de6ad5 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -46,7 +46,7 @@
 		{
 			<script src="_framework/blazor.webassembly.js"></script>
 		}
-		else
+		@if (Model.Runtime == "Server")
 		{
 			<script src="_framework/blazor.server.js"></script>
 		}
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index 76825fbc..da290b8e 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -112,7 +112,7 @@ namespace Oqtane.Pages
                     }
 
                     var site = _sites.GetSite(alias.SiteId);
-                    if (site != null && !site.IsDeleted)
+                    if (site != null && !site.IsDeleted && site.Runtime != "Hybrid")
                     {
                         Route route = new Route(url, alias.Path);
 
@@ -225,7 +225,7 @@ namespace Oqtane.Pages
                     }
                     else
                     {
-                        Message = "Site Is Either Disabled Or Not Configured Correctly";
+                        Message = "Site Is Disabled";
                     }
                 }
                 else