diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs
index 04b96f9e6f..2284804143 100644
--- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs
+++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs
@@ -86,11 +86,6 @@ namespace Volo.Docs.Projects
                 }
             }
 
-            if (versions.Any() && !string.IsNullOrEmpty(project.LatestVersionBranchName))
-            {
-                versions.First().Name = project.LatestVersionBranchName;
-            }
-
             return versions;
         }
 
@@ -126,4 +121,4 @@ namespace Volo.Docs.Projects
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
index a6670f8d72..4a38c166b3 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
@@ -257,6 +257,8 @@ namespace Volo.Docs.Pages.Documents.Project
                 .Select(v => new VersionInfoViewModel(v.DisplayName, v.Name))
                 .ToList();
 
+            SetLatestVersionBranchName(versions);
+
             if (versions.Any())
             {
                 LatestStableVersionInfo = versions.FirstOrDefault(v => !VersionHelper.IsPreRelease(v.Version)) ?? versions.First();
@@ -299,6 +301,14 @@ namespace Volo.Docs.Pages.Documents.Project
             }).ToList();
         }
 
+        private void SetLatestVersionBranchName(List<VersionInfoViewModel> versions)
+        {
+            if (versions.Any() && !string.IsNullOrEmpty(Project.LatestVersionBranchName))
+            {
+                versions.First(v=> !SemanticVersion.Parse(v.Version).IsPrerelease).Version = Project.LatestVersionBranchName;
+            }
+        }
+
         private async Task SetNavigationAsync()
         {
             try
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs
index b8e6dc6d00..54c8953ce1 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs
@@ -62,7 +62,9 @@ namespace Volo.Docs.Pages.Documents
 
             if (versions.Any() && string.Equals(Version, DocsAppConsts.Latest, StringComparison.OrdinalIgnoreCase))
             {
-                Version = (versions.FirstOrDefault(v=> !VersionHelper.IsPreRelease(v.Name)) ?? versions.First()).Name;
+                Version = string.IsNullOrEmpty(Project.LatestVersionBranchName) ?
+                    (versions.FirstOrDefault(v=> !VersionHelper.IsPreRelease(v.Name)) ?? versions.First()).Name :
+                    Project.LatestVersionBranchName;
             }
 
             SearchOutputs = await _documentAppService.SearchAsync(new DocumentSearchInput