diff --git a/PARR.API/Controllers/V1/UnitFieldController.cs b/PARR.API/Controllers/V1/UnitFieldController.cs
index 692145fd..d4ea99e9 100644
--- a/PARR.API/Controllers/V1/UnitFieldController.cs
+++ b/PARR.API/Controllers/V1/UnitFieldController.cs
@@ -39,7 +39,8 @@ namespace PARR.API.Controllers.V1
         [HttpGet(ApiRoutes.UnitField.GetAll)]
         public async Task<IActionResult> GetAll()
         {
-            var unitFields = await unitFieldService.Get().OrderBy(t => t.DisplayName)
+            var unitFields = await unitFieldService.Get()
+                                    .OrderBy(t => t.AihitName)
                                     .ToListAsync();
 
             if (!unitFields.Any())
diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
index a92b9fed..1b068195 100644
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -131,7 +131,7 @@ namespace PARR.API.MappingProfiles
                             },
                             Values = fieldGroup.Select(s => new UnitFieldValueResponse { Id = s.ValueId, Value = s.Value!.Value }).ToList()
                         }
-                    )
+                    ).OrderBy(o=>o.Field.Name)
                 ));
             #endregion