diff --git a/TaxBaik.Web/Components/Admin/App.razor b/TaxBaik.Web/Components/Admin/App.razor
index 021af67..b190a80 100644
--- a/TaxBaik.Web/Components/Admin/App.razor
+++ b/TaxBaik.Web/Components/Admin/App.razor
@@ -34,7 +34,7 @@
         </div>
     </div>
     <MudThemeProvider @bind-IsDarkMode="isDarkMode" Theme="mudTheme" />
-    <Routes @rendermode="new InteractiveServerRenderMode(prerender: true)" />
+    <Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" />
     <script src="_content/MudBlazor/MudBlazor.min.js"></script>
     <script src="js/admin-session.js"></script>
     <script src="_framework/blazor.web.js"></script>
diff --git a/TaxBaik.Web/Components/Admin/Layout/MainLayout.razor b/TaxBaik.Web/Components/Admin/Layout/MainLayout.razor
index bf05980..78b995f 100644
--- a/TaxBaik.Web/Components/Admin/Layout/MainLayout.razor
+++ b/TaxBaik.Web/Components/Admin/Layout/MainLayout.razor
@@ -3,7 +3,7 @@
 @inject IJSRuntime JS
 @inject VersionInfo VersionInfo
 @implements IDisposable
-@rendermode @(new InteractiveWebAssemblyRenderMode(prerender: true))
+@rendermode @(new InteractiveWebAssemblyRenderMode(prerender: false))
 
 <MudPopoverProvider />
 <MudDialogProvider />
@@ -116,6 +116,14 @@
         Navigation.LocationChanged += OnLocationChanged;
     }
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            await JS.InvokeVoidAsync("taxbaikAdminSession.hideLoading");
+        }
+    }
+
     private void OnLocationChanged(object? sender, LocationChangedEventArgs args)
     {
         _ = InvokeAsync(() => JS.InvokeVoidAsync("taxbaikAdminSession.hideLoading"));
diff --git a/TaxBaik.Web/Components/Admin/Pages/Login.razor b/TaxBaik.Web/Components/Admin/Pages/Login.razor
index 632dc80..5a4dd8c 100644
--- a/TaxBaik.Web/Components/Admin/Pages/Login.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/Login.razor
@@ -1,7 +1,7 @@
 @page "/admin/login"
 @layout TaxBaik.Web.Components.Admin.Layout.BlankLayout
 @attribute [AllowAnonymous]
-@rendermode @(new InteractiveServerRenderMode(prerender: true))
+@rendermode @(new InteractiveWebAssemblyRenderMode(prerender: false))
 @inject IApiClient ApiClient
 @inject ILocalStorageService LocalStorageService
 @inject IJSRuntime Js