diff --git a/Oqtane.Client/UI/Head.razor b/Oqtane.Client/UI/Head.razor
index 7929e506..fa06fc0e 100644
--- a/Oqtane.Client/UI/Head.razor
+++ b/Oqtane.Client/UI/Head.razor
@@ -3,8 +3,6 @@
 @using Oqtane.Shared
 @inject SiteState SiteState
 @implements IDisposable
-@* the following StreamRendering attribute is required - if it is removed the framework will not render the content in static rendering *@
-@attribute [StreamRendering]
 
 @if (!string.IsNullOrEmpty(_title))
 {
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index 1504e0b1..5d429954 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -1,13 +1,13 @@
 @namespace Oqtane.UI
 @inject SiteState SiteState
 
-@if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Interactive)
+@if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Static)
 {
-	<StreamRenderingDisabled ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" />
+    <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" />
 }
 else
 {
-    <StreamRenderingEnabled ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" />
+    <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, PageState.Site.Prerender)" />
 }
 
 @code {
diff --git a/Oqtane.Client/UI/Routes.razor b/Oqtane.Client/UI/Routes.razor
index b998003a..fb88abcb 100644
--- a/Oqtane.Client/UI/Routes.razor
+++ b/Oqtane.Client/UI/Routes.razor
@@ -3,8 +3,6 @@
 @inject IInstallationService InstallationService
 @inject IJSRuntime JSRuntime
 @inject SiteState SiteState
-@* the following StreamRendering attribute is required - if it is removed the framework will not render the content in static rendering *@
-@attribute [StreamRendering] 
 
 @if (_initialized)
 {
diff --git a/Oqtane.Client/UI/StreamRenderingDisabled.razor b/Oqtane.Client/UI/StreamRenderingDisabled.razor
deleted file mode 100644
index 9b161585..00000000
--- a/Oqtane.Client/UI/StreamRenderingDisabled.razor
+++ /dev/null
@@ -1,21 +0,0 @@
-@attribute [StreamRendering(false)]
-
-@if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Static)
-{
-    <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" />
-}
-else
-{
-    <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, PageState.Site.Prerender)" />
-}
-
-@code {
-    [Parameter]
-    public SiteState SiteState { get; set; }
-
-    [Parameter]
-    public PageState PageState { get; set; }
-
-    [Parameter]
-    public Module ModuleState { get; set; }
-}
diff --git a/Oqtane.Client/UI/StreamRenderingEnabled.razor b/Oqtane.Client/UI/StreamRenderingEnabled.razor
deleted file mode 100644
index a48bb967..00000000
--- a/Oqtane.Client/UI/StreamRenderingEnabled.razor
+++ /dev/null
@@ -1,21 +0,0 @@
-@attribute [StreamRendering(true)]
-
-@if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Static)
-{
-    <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" />
-}
-else
-{
-    <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@InteractiveRenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, PageState.Site.Prerender)" />
-}
-
-@code {
-    [Parameter]
-    public SiteState SiteState { get; set; }
-
-    [Parameter]
-    public PageState PageState { get; set; }
-
-    [Parameter]
-    public Module ModuleState { get; set; }
-}