diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 79c00367..05281844 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -115,7 +115,7 @@ namespace Oqtane.Modules
 
         protected override bool ShouldRender()
         {
-            return PageState.RenderId == ModuleState.RenderId;
+            return PageState?.RenderId == ModuleState?.RenderId;
         }
 
         // path method
diff --git a/Oqtane.Client/Themes/ContainerBase.cs b/Oqtane.Client/Themes/ContainerBase.cs
index d05f3610..8e0250c4 100644
--- a/Oqtane.Client/Themes/ContainerBase.cs
+++ b/Oqtane.Client/Themes/ContainerBase.cs
@@ -10,7 +10,7 @@ namespace Oqtane.Themes
 
         protected override bool ShouldRender()
         {
-            return PageState.RenderId == ModuleState.RenderId;
+            return PageState?.RenderId == ModuleState?.RenderId;
         }
     }
 }
diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index 1607ea18..893dafd1 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -32,7 +32,7 @@
 
     protected override bool ShouldRender()
     {
-        return PageState.RenderId == ModuleState.RenderId;
+        return PageState?.RenderId == ModuleState?.RenderId;
     }
 
     protected override void OnInitialized()
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index 6bffb143..71143fc3 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -50,7 +50,7 @@ else
 
     protected override bool ShouldRender()
     {
-        return PageState.RenderId == ModuleState.RenderId;
+        return PageState?.RenderId == ModuleState?.RenderId;
     }
 
     protected override void OnParametersSet()