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 1e1d63bf71..481a773efc 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
@@ -14,14 +14,15 @@ namespace Volo.CmsKit.Public.Pages
 
         public virtual async Task<PageDto> FindByUrlAsync(string url)
         {
+            PageDto pageDto = null;
             var page = await PageRepository.FindByUrlAsync(url);
 
-            if (page == null)
+            if (page !=null)
             {
-                return null;
+                pageDto = ObjectMapper.Map<Page, PageDto>(page);
             }
             
-            return ObjectMapper.Map<Page, PageDto>(page);
+            return pageDto;
         }
     }
 }
\ No newline at end of file