diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 6d8d2dd2..930191cb 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -424,7 +424,6 @@
 								{
 									site.Runtime = _runtime;
 									site.RenderMode = _runtime + _prerender;
-									refresh = true;
 									reload = true; // needs to be reloaded on server
 								}
 							}
@@ -525,7 +524,7 @@
 
 							await logger.LogInformation("Site Settings Saved {Site}", site);
 
-							if (refresh)
+							if (refresh || reload)
 							{
 								NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
 							}
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index 416f1cf6..cdd2a127 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -258,7 +258,7 @@ namespace Oqtane.Pages
         private string CreatePWAScript(Alias alias, Site site, Route route)
         {
             return
-            "<script>" +
+            "<script id=\"app-pwa\">" +
                 "setTimeout(() => { " +
                     "var manifest = { " +
                         "\"name\": \"" + site.Name + "\", " +
@@ -283,6 +283,8 @@ namespace Oqtane.Pages
                     "document.getElementById('app-manifest').setAttribute('href', url); " +
                 "} " +
                 ", 1000);" +
+            "</script>" + Environment.NewLine +
+            "<script id=\"app-serviceworker\">" +
                 "if ('serviceWorker' in navigator) { " +
                     "navigator.serviceWorker.register('/service-worker.js').then(function(registration) { " +
                         "console.log('ServiceWorker Registration Successful'); " +