diff --git a/internal/modules/master/warehouses/controllers/warehouse.controller.go b/internal/modules/master/warehouses/controllers/warehouse.controller.go
index a7cfac94..4e93cb52 100644
--- a/internal/modules/master/warehouses/controllers/warehouse.controller.go
+++ b/internal/modules/master/warehouses/controllers/warehouse.controller.go
@@ -28,6 +28,7 @@ func (u *WarehouseController) GetAll(c *fiber.Ctx) error {
 		Limit:                  c.QueryInt("limit", 10),
 		Search:                 c.Query("search", ""),
 		AreaId:                 c.QueryInt("area_id", 0),
+		LocationId:             c.QueryInt("location_id", 0),
 		ActiveProjectFlockOnly: c.QueryBool("active_project_flock", false),
 	}
 
diff --git a/internal/modules/master/warehouses/services/warehouse.service.go b/internal/modules/master/warehouses/services/warehouse.service.go
index 0b9dfc18..0730bc48 100644
--- a/internal/modules/master/warehouses/services/warehouse.service.go
+++ b/internal/modules/master/warehouses/services/warehouse.service.go
@@ -58,6 +58,9 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 		if params.AreaId != 0 {
 			db = db.Where("area_id = ?", params.AreaId)
 		}
+		if params.LocationId != 0 {
+			db = db.Where("location_id = ?", params.LocationId)
+		}
 		if params.ActiveProjectFlockOnly {
 			db = db.Where(`
 				EXISTS (
diff --git a/internal/modules/master/warehouses/validations/warehouse.validation.go b/internal/modules/master/warehouses/validations/warehouse.validation.go
index 1e305520..be796082 100644
--- a/internal/modules/master/warehouses/validations/warehouse.validation.go
+++ b/internal/modules/master/warehouses/validations/warehouse.validation.go
@@ -21,5 +21,6 @@ type Query struct {
 	Limit                  int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
 	Search                 string `query:"search" validate:"omitempty,max=50"`
 	AreaId                 int    `query:"area_id" validate:"omitempty,number,gt=0"`
+	LocationId             int    `query:"location_id" validate:"omitempty,number,gt=0"`
 	ActiveProjectFlockOnly bool   `query:"active_project_flock"`
 }