diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs
index 2df177b620..332892822f 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs
@@ -42,7 +42,7 @@ namespace Volo.Abp.Account.Web.Pages
             _resourceStore = resourceStore;
         }
 
-        public virtual async Task OnGet()
+        public virtual async Task<IActionResult> OnGet()
         {
             var request = await _interaction.GetAuthorizationContextAsync(ReturnUrl);
             if (request == null)
@@ -74,6 +74,8 @@ namespace Volo.Abp.Account.Web.Pages
             {
                 ConsentInput.ApiScopes.Add(GetOfflineAccessScope(true));
             }
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPost(string userDecision)
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs
index de62eb370d..8cb2c2bc1e 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs
@@ -24,9 +24,9 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return RedirectToPage("/Account/Login");
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
index 58614de744..deed56b736 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Volo.Abp.Identity;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Volo.Abp.Account.Web.Pages.Account
 {
@@ -17,16 +18,18 @@ namespace Volo.Abp.Account.Web.Pages.Account
             ProfileAppService = profileAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             var user = await ProfileAppService.GetAsync();
 
             PersonalSettingsInfoModel = ObjectMapper.Map<ProfileDto, PersonalSettingsInfoModel>(user);
+
+            return Page();
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
index db085d6587..3b5a5b2cd1 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
@@ -31,9 +31,11 @@ namespace Volo.Abp.Account.Web.Pages.Account
             AccountAppService = accountAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             await CheckSelfRegistrationAsync();
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs
index 94a52cd0bd..56f2e44b85 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs
@@ -41,9 +41,9 @@ namespace Volo.Abp.Account.Web.Pages.Account
             //);
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs
index 9a15efd829..3f3c0ea08a 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs
@@ -43,7 +43,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs
             return Page();
         }
 
-        public async Task OnPostAsync()
+        public async Task<IActionResult> OnPostAsync()
         {
             await _blogAppService.Update(Blog.Id, new UpdateBlogDto()
             {
@@ -51,6 +51,8 @@ namespace Volo.Blogging.Pages.Admin.Blogs
                 ShortName = Blog.ShortName,
                 Description = Blog.Description
             });
+
+            return Page();
         }
 
         public class BlogEditViewModel
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
index f6e86a2218..e9edf37a7e 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
@@ -46,12 +46,14 @@ namespace Volo.Blogging.Pages.Blog.Posts
             _commentAppService = commentAppService;
         }
 
-        public async Task OnGetAsync()
+        public async Task<IActionResult> OnGetAsync()
         {
             await GetData();
+
+            return Page();
         }
 
-        public async Task OnPostAsync()
+        public async Task<IActionResult> OnPostAsync()
         {
             var comment = await _commentAppService.CreateAsync(new CreateCommentDto()
             {
@@ -63,6 +65,8 @@ namespace Volo.Blogging.Pages.Blog.Posts
             FocusCommentId = comment.Id;
 
             await GetData();
+
+            return Page();
         }
 
         private async Task GetData()
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs
index f27d4e8f05..5dec995b97 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs
@@ -35,11 +35,13 @@ namespace Volo.Blogging.Pages.Blog.Posts
             _tagAppService = tagAppService;
         }
 
-        public async Task OnGetAsync()
+        public async Task<ActionResult> OnGetAsync()
         {
             Blog = await _blogAppService.GetByShortNameAsync(BlogShortName);
             Posts = (await _postAppService.GetListByBlogIdAndTagName(Blog.Id, TagName)).Items;
             PopularTags = (await _tagAppService.GetPopularTags(Blog.Id, new GetPopularTagsInput {ResultCount = 10, MinimumPostCount = 2}));
+
+            return Page();
         }
     }
 }
\ No newline at end of file
diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs
index 8636bf2567..62795587da 100644
--- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs
+++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs
@@ -1,13 +1,14 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace Volo.ClientSimulation.Pages.ClientSimulation
 {
     public class IndexModel : PageModel
     {
-        public async Task OnGetAsync()
+        public Task<IActionResult> OnGetAsync()
         {
-
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
\ No newline at end of file
diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs
index e55f504f10..01710098aa 100644
--- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs
+++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs
@@ -16,10 +16,10 @@ namespace Volo.ClientSimulation.Pages.ClientSimulation
             Simulation = simulation;
         }
 
-        public Task OnGetAsync()
+        public Task<IActionResult> OnGetAsync()
         {
             Snapshot = Simulation.CreateSnapshot();
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
         public async Task<IActionResult> OnPostStartAsync()
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs
index de530d36b8..7da4796fbd 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
@@ -6,8 +7,9 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects
     [Authorize(DocsAdminPermissions.Projects.Default)]
     public class IndexModel : DocsAdminPageModel
     {
-        public void OnGet()
+        public ActionResult OnGet()
         {
+            return Page();
         }
     }
 }
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
index 6d022c7048..e7244c80f1 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
@@ -16,9 +16,9 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
             IdentityRoleAppService = identityRoleAppService;
         }
 
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
         public virtual async Task<IActionResult> OnPostAsync()
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs
index 0fab86d195..254c1785bc 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs
@@ -1,17 +1,18 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
 {
     public class IndexModel : IdentityPageModel
     {
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs
index f480ee925f..9622d87de2 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs
@@ -25,7 +25,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             IdentityRoleAppService = identityRoleAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             UserInfo = new UserInfoViewModel();
 
@@ -37,6 +37,8 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             {
                 role.IsAssigned = role.IsDefault;
             }
+
+            return Page();
         }
 
         public virtual async Task<NoContentResult> OnPostAsync()
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs
index df676ecaf4..7ffb58ccab 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs
@@ -27,7 +27,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             IdentityRoleAppService = identityRoleAppService;
         }
 
-        public virtual async Task OnGetAsync(Guid id)
+        public virtual async Task<IActionResult> OnGetAsync(Guid id)
         {
             UserInfo = ObjectMapper.Map<IdentityUserDto, UserInfoViewModel>(await IdentityUserAppService.GetAsync(id));
 
@@ -41,6 +41,8 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
                     role.IsAssigned = true;
                 }
             }
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs
index d1382c59b6..b6ff2c0e94 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs
@@ -1,17 +1,18 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Volo.Abp.Identity.Web.Pages.Identity.Users
 {
     public class IndexModel : IdentityPageModel
     {
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
index 02f5a8af17..041121b8cb 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
@@ -38,7 +38,7 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
             PermissionAppService = permissionAppService;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             ValidateModel();
 
@@ -62,6 +62,8 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
             }
 
             SelectAllInAllTabs = Groups.All(g => g.IsAllPermissionsGranted);
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs
index 31602957cf..7f9c332e13 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 
 namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement
@@ -16,7 +17,7 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement
             Options = options.Value;
         }
 
-        public virtual async Task OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             SettingPageCreationContext = new SettingPageCreationContext(ServiceProvider);
 
@@ -24,11 +25,13 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement
             {
                 await contributor.ConfigureAsync(SettingPageCreationContext);
             }
+            
+            return Page();
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
index 5456e512ec..9093437f98 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
@@ -17,7 +17,7 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
             TenantAppService = tenantAppService;
         }
 
-        public virtual async Task OnGetAsync(Guid id)
+        public virtual async Task<IActionResult> OnGetAsync(Guid id)
         {
             var defaultConnectionString = await TenantAppService.GetDefaultConnectionStringAsync(id);
             Tenant = new TenantInfoModel
@@ -26,6 +26,8 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
                 DefaultConnectionString = defaultConnectionString,
                 UseSharedDatabase = defaultConnectionString.IsNullOrWhiteSpace()
             };
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
index 86569149f8..fa517594ee 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
@@ -16,9 +16,9 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
             TenantAppService = tenantAppService;
         }
 
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
         public virtual async Task<IActionResult> OnPostAsync()
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
index 1ae5709d57..74ac176b02 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
@@ -17,11 +17,13 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
             TenantAppService = tenantAppService;
         }
 
-        public virtual async Task OnGetAsync(Guid id)
+        public virtual async Task<IActionResult> OnGetAsync(Guid id)
         {
             Tenant = ObjectMapper.Map<TenantDto, TenantInfoModel>(
                 await TenantAppService.GetAsync(id)
             );
+
+            return Page();
         }
 
         public virtual async Task<IActionResult> OnPostAsync()
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs
index 93bc14a62b..11395d870f 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs
@@ -1,18 +1,19 @@
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
 {
     public class IndexModel : TenantManagementPageModel
     {
-        public virtual Task OnGetAsync()
+        public virtual Task<IActionResult> OnGetAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
 
-        public virtual Task OnPostAsync()
+        public virtual Task<IActionResult> OnPostAsync()
         {
-            return Task.CompletedTask;
+            return Task.FromResult<IActionResult>(Page());
         }
     }
 }
\ No newline at end of file