diff --git a/internal/modules/master/nonstocks/services/nonstock.service.go b/internal/modules/master/nonstocks/services/nonstock.service.go
index c0001a52..e201b1f1 100644
--- a/internal/modules/master/nonstocks/services/nonstock.service.go
+++ b/internal/modules/master/nonstocks/services/nonstock.service.go
@@ -59,6 +59,14 @@ func (s nonstockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 
 	nonstocks, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+
+		if params.SupplierID != nil {
+			supplierID := *params.SupplierID
+			db = db.Joins("JOIN nonstock_suppliers ON nonstock_suppliers.nonstock_id = nonstocks.id").
+				Where("nonstock_suppliers.supplier_id = ?", supplierID).
+				Group("nonstocks.id") // Prevent duplicates from join
+		}
+
 		if params.Search != "" {
 			return db.Where("name LIKE ?", "%"+params.Search+"%")
 		}
diff --git a/internal/modules/master/nonstocks/validations/nonstock.validation.go b/internal/modules/master/nonstocks/validations/nonstock.validation.go
index c421b7ec..b58370d5 100644
--- a/internal/modules/master/nonstocks/validations/nonstock.validation.go
+++ b/internal/modules/master/nonstocks/validations/nonstock.validation.go
@@ -15,7 +15,8 @@ type Update struct {
 }
 
 type Query struct {
-	Page   int    `query:"page" validate:"omitempty,number,min=1"`
-	Limit  int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
-	Search string `query:"search" validate:"omitempty,max=50"`
+	Page       int    `query:"page" validate:"omitempty,number,min=1"`
+	Limit      int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
+	Search     string `query:"search" validate:"omitempty,max=50"`
+	SupplierID *uint  `query:"supplier_id" validate:"omitempty,gt=0"`
 }