diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 752ff996..db59fd4f 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -50,7 +50,7 @@
 
         DynamicComponent = builder =>
         {
-            if (PageState != null)
+            if (PageState != null && !PageState.Refresh)
             {
                 builder.OpenComponent(0, typeof(ThemeBuilder));
                 builder.CloseComponent();