diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPageAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPageAppService.cs
index d8ea8f1751..7363d32a3c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPageAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPageAppService.cs
@@ -5,6 +5,6 @@ namespace Volo.CmsKit.Public.Pages
 {
     public interface IPageAppService
     {
-        Task<PageDto> GetByUrlAsync([NotNull] string url);
+        Task<PageDto> FindByUrlAsync([NotNull] string url);
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PageAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PageAppService.cs
index 38f4406cab..e78d54a742 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PageAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Pages/PageAppService.cs
@@ -12,9 +12,9 @@ namespace Volo.CmsKit.Public.Pages
             PageRepository = pageRepository;
         }
 
-        public virtual async Task<PageDto> GetByUrlAsync(string url)
+        public virtual async Task<PageDto> FindByUrlAsync(string url)
         {
-            var page = await PageRepository.GetByUrlAsync(url);
+            var page = await PageRepository.FindByUrlAsync(url);
             
             return ObjectMapper.Map<Page, PageDto>(page);
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs
index 45dda25ab5..4d1c5391c7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs
@@ -20,7 +20,7 @@ namespace Volo.CmsKit.Public.Pages
         [Route("url/{url}")]
         public Task<PageDto> GetByUrlAsync(string url)
         {
-            return PageAppService.GetByUrlAsync(url);
+            return PageAppService.FindByUrlAsync(url);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
index 0149722671..2dba2f667a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
@@ -56,7 +56,7 @@ namespace Volo.CmsKit.Public.Web
 
             Configure<RazorPagesOptions>(options =>
             {
-                //...
+                options.Conventions.AddPageRoute("/CmsKit/Pages/Index", "/{pageUrl}");
             });
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs
index 1d5dca0940..5443608845 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Pages/Index.cshtml.cs
@@ -19,9 +19,16 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Pages
             PageAppService = pageAppService;
         }
 
-        public async Task OnGetAsync()
+        public async Task<IActionResult> OnGetAsync()
         {
-            Page = await PageAppService.GetByUrlAsync(PageUrl);
+            Page = await PageAppService.FindByUrlAsync(PageUrl);
+
+            if (Page == null)
+            {
+                return NotFound();
+            }
+
+            return Page();
         }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs
index 290f02caff..c0943a1279 100644
--- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PagePublicAppService_Tests.cs
@@ -18,15 +18,20 @@ namespace Volo.CmsKit.Pages
         }
 
         [Fact]
-        public async Task ShouldGetByUrlAsync()
+        public async Task ShouldFindByUrlAsync()
         {
-            await Should.NotThrowAsync(async () => await _pageAppService.GetByUrlAsync(_data.Page_1_Url));
+            var page = await _pageAppService.FindByUrlAsync(_data.Page_1_Url);
+
+            page.ShouldNotBeNull();
+            page.Title.ShouldBe(_data.Page_1_Title);
         }
         
         [Fact]
         public async Task ShouldNotGetByUrlAsync()
         {
-            await Should.ThrowAsync<Exception>(async () => await _pageAppService.GetByUrlAsync("not-exist-url"));
+            var page = await _pageAppService.FindByUrlAsync("not-exist-url");
+            
+            page.ShouldBeNull();
         }
     }
 }
\ No newline at end of file