diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index a8488ae6..be961bac 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -12,17 +12,10 @@
             {
                 <NavLink class="ms-2" href="@NavigateUrl("admin/log")">View Details</NavLink>
             }
-            @if (ModuleState != null)
-            {
-                @if (ModuleState.RenderMode == RenderModes.Static)
-                {
-                    <a href="@NavigationManager.Uri" class="btn-close" data-dismiss="alert" aria-label="close"></a>
-                }
-                else
-                {
-                    <button type="button" class="btn-close" data-dismiss="alert" aria-label="close" @onclick="CloseMessage"></button>
-                }
-            }
+            <form method="post" class="app-form-inline" @formname="ModuleMessageForm" @onsubmit="CloseMessage" data-enhance>
+                <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                <button type="submit" class="btn-close" data-dismiss="alert" aria-label="close"></button>
+            </form>
         </div>
     }
 
@@ -35,17 +28,10 @@
                 {
                     <NavLink class="ms-2" href="@NavigateUrl("admin/log")">View Details</NavLink>
                 }
-                @if (ModuleState != null)
-                {
-                    @if (ModuleState.RenderMode == RenderModes.Static)
-                    {
-                        <a href="@NavigationManager.Uri" class="btn-close" data-dismiss="alert" aria-label="close"></a>
-                    }
-                    else
-                    {
-                        <button type="button" class="btn-close" data-dismiss="alert" aria-label="close" @onclick="CloseMessage"></button>
-                    }
-                }
+                <form method="post" class="app-form-inline" @formname="ModuleMessageForm" @onsubmit="CloseMessage" data-enhance>
+                    <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
+                    <button type="submit" class="btn-close" data-dismiss="alert" aria-label="close"></button>
+                </form>
             </div>
         </div>
     }