diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index 53ac20f6..b217749b 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -1,14 +1,15 @@
 @namespace Oqtane.UI
 @inject SiteState SiteState
 
-<div>Render Mode: @ModuleState.RenderMode</div><br />
 @if (PageState.Site.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Static)
 {
+    <div>Render Mode: @PageState.Site.RenderMode</div><br />
 	<RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" />
 }
 else
 {
-	<RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@RenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, PageState.Site.Prerender)" />
+    <div>Render Mode: @ModuleState.RenderMode</div><br />
+    <RenderModeBoundary ModuleState="@ModuleState" PageState="@PageState" SiteState="@SiteState" @rendermode="@RenderMode.GetInteractiveRenderMode(PageState.Site.Runtime, PageState.Site.Prerender)" />
 }
 
 @code {
diff --git a/Oqtane.Client/UI/RenderMode.cs b/Oqtane.Client/UI/RenderMode.cs
index c9cd3557..a6c1c865 100644
--- a/Oqtane.Client/UI/RenderMode.cs
+++ b/Oqtane.Client/UI/RenderMode.cs
@@ -17,7 +17,7 @@ namespace Oqtane.UI
                 case Runtimes.Auto:
                     return new InteractiveAutoRenderMode(prerender);
             }
-            return null;
+            return new InteractiveServerRenderMode(prerender); // default to interactiver server
         }
     }
 }
diff --git a/Oqtane.Client/UI/RenderModeBoundary.razor b/Oqtane.Client/UI/RenderModeBoundary.razor
index 824797d0..73127f54 100644
--- a/Oqtane.Client/UI/RenderModeBoundary.razor
+++ b/Oqtane.Client/UI/RenderModeBoundary.razor
@@ -1,5 +1,5 @@
 @namespace Oqtane.UI
-@inject SiteState SiteStateService
+@inject SiteState ComponentSiteState // can refer to either a static or interactive SiteState - it depends on the render mode
 @inject IStringLocalizer<ModuleInstance> Localizer
 @inject ILogService LoggingService
 @inherits ErrorBoundary
@@ -71,11 +71,11 @@ else
                 if (ModuleType != null)
                 {
                     // repopulate the SiteState service based on the values passed in the SiteState parameter (this is how state is marshalled across the render mode boundary)
-                    SiteStateService.Alias = SiteState.Alias;
-                    SiteStateService.AntiForgeryToken = SiteState.AntiForgeryToken;
-                    SiteStateService.AuthorizationToken = SiteState.AuthorizationToken;
-                    SiteStateService.RemoteIPAddress = SiteState.RemoteIPAddress;
-                    SiteStateService.IsPrerendering = SiteState.IsPrerendering;
+                    ComponentSiteState.Alias = SiteState.Alias;
+                    ComponentSiteState.AntiForgeryToken = SiteState.AntiForgeryToken;
+                    ComponentSiteState.AuthorizationToken = SiteState.AuthorizationToken;
+                    ComponentSiteState.RemoteIPAddress = SiteState.RemoteIPAddress;
+                    ComponentSiteState.IsPrerendering = SiteState.IsPrerendering;
 
                     ModuleParameters = new Dictionary<string, object> { { "RenderModeBoundary", this } };
                 }