diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDefaultDocumentInput.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDefaultDocumentInput.cs
index c606c3be5d..3deeb83967 100644
--- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDefaultDocumentInput.cs
+++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDefaultDocumentInput.cs
@@ -12,6 +12,7 @@ namespace Volo.Docs.Documents
         [StringLength(ProjectConsts.MaxVersionNameLength)]
         public string Version { get; set; }
 
+        [Required]
         [StringLength(LanguageConsts.MaxLanguageCodeLength)]
         public string LanguageCode { get; set; }
     }
diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDocumentInput.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDocumentInput.cs
index e28237c352..412f41b82e 100644
--- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDocumentInput.cs
+++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDocumentInput.cs
@@ -16,6 +16,7 @@ namespace Volo.Docs.Documents
         [StringLength(ProjectConsts.MaxVersionNameLength)]
         public string Version { get; set; }
 
+        [Required]
         [StringLength(LanguageConsts.MaxLanguageCodeLength)]
         public string LanguageCode { get; set; }
     }
diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDocumentResourceInput.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDocumentResourceInput.cs
index 1fff5a1e12..6f759c47d8 100644
--- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDocumentResourceInput.cs
+++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetDocumentResourceInput.cs
@@ -16,6 +16,7 @@ namespace Volo.Docs.Documents
         [StringLength(ProjectConsts.MaxVersionNameLength)]
         public string Version { get; set; }
 
+        [Required]
         [StringLength(LanguageConsts.MaxLanguageCodeLength)]
         public string LanguageCode { get; set; }
     }
diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetNavigationDocumentInput.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetNavigationDocumentInput.cs
index c2a614ce58..6866c8c633 100644
--- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetNavigationDocumentInput.cs
+++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/GetNavigationDocumentInput.cs
@@ -12,6 +12,7 @@ namespace Volo.Docs.Documents
         [StringLength(ProjectConsts.MaxVersionNameLength)]
         public string Version { get; set; }
 
+        [Required]
         [StringLength(LanguageConsts.MaxLanguageCodeLength)]
         public string LanguageCode { get; set; }
     }
diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
index 76b56c8c82..cdc50f869d 100644
--- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
+++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
@@ -73,6 +73,7 @@ namespace Volo.Docs.Documents
         {
             var project = await _projectRepository.GetAsync(input.ProjectId);
             var cacheKey = $"Resource@{project.ShortName}#{input.LanguageCode}#{input.Name}#{input.Version}";
+            input.Version = string.IsNullOrWhiteSpace(input.Version) ? project.LatestVersionBranchName : input.Version;
 
             async Task<DocumentResourceDto> GetResourceAsync()
             {
@@ -105,6 +106,8 @@ namespace Volo.Docs.Documents
             string languageCode,
             string version)
         {
+            version = string.IsNullOrWhiteSpace(version) ? project.LatestVersionBranchName : version;
+
             var cacheKey = $"Document@{project.ShortName}#{languageCode}#{documentName}#{version}";
 
             async Task<DocumentWithDetailsDto> GetDocumentAsync()
diff --git a/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs b/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs
index 1484025094..3ea8c312f2 100644
--- a/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs
+++ b/modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs
@@ -50,7 +50,7 @@ namespace Volo.Docs.Projects
         }
 
         [HttpGet]
-        [Route("{shortName}/{versiion}/languageList")]
+        [Route("{shortName}/{version}/languageList")]
         public Task<LanguageConfig> GetLanguageListAsync(string shortName, string version)
         {
             return ProjectAppService.GetLanguageListAsync(shortName, version);