diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index cc37a258..6679cf83 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -29,7 +29,6 @@
     {
         try
         {
-            content = "";
             if (ShouldRender())
             {
                 var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
@@ -38,6 +37,10 @@
                     content = htmltext.Content;
                     content = Utilities.FormatContent(content, PageState.Alias, "render");
                 }
+                else
+                {
+                    content = "";
+                }
             }
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index ab76f0bc..5f9b1b7c 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -430,9 +430,16 @@
                 await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane);
                 await UpdateSettingsAsync();
 
-                _message = $"<div class=\"alert alert-success mt-2 text-center\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>";
-                _title = "";
-                NavigationManager.NavigateTo(Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, ""));
+                if (PageState.RenderMode == RenderModes.Interactive)
+                {
+                    _message = $"<div class=\"alert alert-success mt-2 text-center\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>";
+                    _title = "";
+                    NavigationManager.NavigateTo(Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, ""));
+                }
+                else // reload page in static rendering
+                {
+                    NavigationManager.NavigateTo(Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, ""), true);
+                }
             }
             else
             {