diff --git a/Oqtane.Client/UI/Head.razor b/Oqtane.Client/UI/Head.razor
index d1435cc3e..3f59e2d46 100644
--- a/Oqtane.Client/UI/Head.razor
+++ b/Oqtane.Client/UI/Head.razor
@@ -49,15 +49,15 @@
 
     private string RemoveScripts(string headcontent)
     {
-        if (!string.IsNullOrEmpty(headcontent))
-        {
-            var index = headcontent.IndexOf("<script");
-            while (index >= 0)
-            {
-                headcontent = headcontent.Remove(index, headcontent.IndexOf("</script>") + 9 - index);
-                index = headcontent.IndexOf("<script");
-            }
-        }
+        // if (!string.IsNullOrEmpty(headcontent))
+        // {
+        //     var index = headcontent.IndexOf("<script");
+        //     while (index >= 0)
+        //     {
+        //         headcontent = headcontent.Remove(index, headcontent.IndexOf("</script>") + 9 - index);
+        //         index = headcontent.IndexOf("<script");
+        //     }
+        // }
         return headcontent;
     }
 
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index b30f8a34a..8bb4fe475 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -81,7 +81,7 @@
             while (index >= 0)
             {
                 var element = content.Substring(index, content.IndexOf(">", index) - index + 1);
-                if (!string.IsNullOrEmpty(element) && !element.ToLower().StartsWith("<script") && !element.ToLower().StartsWith("</script"))
+                if (!string.IsNullOrEmpty(element) && (PageState.RenderMode == RenderModes.Static || (!element.ToLower().StartsWith("<script") && !element.ToLower().StartsWith("</script"))))
                 {
                     if (!headcontent.Contains(element))
                     {