diff --git a/internal/modules/master/areas/services/area.service.go b/internal/modules/master/areas/services/area.service.go
index 6110aaef..c0e351d7 100644
--- a/internal/modules/master/areas/services/area.service.go
+++ b/internal/modules/master/areas/services/area.service.go
@@ -55,9 +55,9 @@ func (s areaService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Ar
 		db = s.withRelations(db)
 		db, scopeErr = m.ApplyAreaScope(c, db, "id")
 		if params.Search != "" {
-			return db.Where("name ILIKE ?", "%"+params.Search+"%")
+			db = db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
-		return db.Order("created_at DESC").Order("updated_at DESC")
+		return db.Order("name ASC").Order("id ASC")
 	})
 
 	if scopeErr != nil {
diff --git a/internal/modules/master/locations/services/location.service.go b/internal/modules/master/locations/services/location.service.go
index 8aa01dbf..138c33b9 100644
--- a/internal/modules/master/locations/services/location.service.go
+++ b/internal/modules/master/locations/services/location.service.go
@@ -71,7 +71,7 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 				)
 			`, utils.ProjectFlockCategoryLaying)
 		}
-		return db.Order("created_at DESC").Order("updated_at DESC")
+		return db.Order("locations.name ASC").Order("locations.id ASC")
 	})
 
 	if scopeErr != nil {
diff --git a/internal/modules/production/project_flocks/repositories/projectflock.repository.go b/internal/modules/production/project_flocks/repositories/projectflock.repository.go
index 6fab653f..60b5fc01 100644
--- a/internal/modules/production/project_flocks/repositories/projectflock.repository.go
+++ b/internal/modules/production/project_flocks/repositories/projectflock.repository.go
@@ -322,8 +322,8 @@ func (r *ProjectflockRepositoryImpl) buildOrderExpressions(sortBy, sortOrder str
 		}
 	default:
 		return []string{
-			"project_flocks.created_at DESC",
-			"project_flocks.updated_at DESC",
+			"project_flocks.flock_name ASC",
+			"project_flocks.id ASC",
 		}
 	}
 }