diff --git a/src/components/pages/production/project-flock/ProjectFlockTable.tsx b/src/components/pages/production/project-flock/ProjectFlockTable.tsx
index 233c43d7..025e7186 100644
--- a/src/components/pages/production/project-flock/ProjectFlockTable.tsx
+++ b/src/components/pages/production/project-flock/ProjectFlockTable.tsx
@@ -618,7 +618,7 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
       <ConfirmationModal
         ref={deleteModal.ref}
         type='error'
-        text={`Apakah anda yakin ingin menghapus data Project Flock ini (${selectedProjectFlock?.flock_name})?`}
+        text={`Apakah anda yakin ingin menghapus data Project Flock ini (${selectedRowIds?.length} data)?`}
         secondaryButton={{
           text: 'Tidak',
         }}
@@ -633,7 +633,7 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
       <ConfirmationModalWithNotes
         ref={confirmModal.ref}
         type={approvalAction == 'APPROVED' ? 'success' : 'error'}
-        text={`Apakah anda yakin ingin ${approvalAction == 'APPROVED' ? 'approve' : 'reject'} data Project Flock ini (${selectedRowIds.length} data)?`}
+        text={`Apakah anda yakin ingin ${approvalAction == 'APPROVED' ? 'approve' : 'reject'} data Project Flock ini (${selectedRowIds?.length} data)?`}
         secondaryButton={{
           text: 'Tidak',
         }}
diff --git a/src/components/pages/production/project-flock/form/ProjectFlockForm.schema.ts b/src/components/pages/production/project-flock/form/ProjectFlockForm.schema.ts
index 9ac07c0f..5ed74b5a 100644
--- a/src/components/pages/production/project-flock/form/ProjectFlockForm.schema.ts
+++ b/src/components/pages/production/project-flock/form/ProjectFlockForm.schema.ts
@@ -21,6 +21,11 @@ type ProjectFlockFormSchemaType = {
     label: string;
   } | null;
   fcr_id: number;
+  production_standard: {
+    value: number | string;
+    label: string;
+  } | null;
+  production_standard_id: number;
   location: {
     value: number | string;
     label: string;
@@ -100,6 +105,15 @@ export const ProjectFlockFormSchema: Yup.ObjectSchema<ProjectFlockFormSchemaType
       .min(1, 'FCR wajib diisi!')
       .required('FCR wajib diisi!'),
 
+    // Production Standard
+    production_standard: Yup.object({
+      value: Yup.number().required('ID Standar Produksi wajib diisi!'),
+      label: Yup.string().required('Nama Standar Produksi wajib diisi!'),
+    }).nullable(),
+    production_standard_id: Yup.number()
+      .min(1, 'Standar Produksi wajib diisi!')
+      .required('Standar Produksi wajib diisi!'),
+
     // Location
     location: Yup.object({
       value: Yup.number().required('ID Lokasi wajib diisi!'),
diff --git a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
index 46830879..348f96a4 100644
--- a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
+++ b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
@@ -13,6 +13,7 @@ import {
   KandangApi,
   LocationApi,
   NonstockApi,
+  ProductionStandardApi,
 } from '@/services/api/master-data';
 import { Icon } from '@iconify/react';
 import { FormikErrors, useFormik } from 'formik';
@@ -136,6 +137,11 @@ const ProjectFlockForm = ({
     'name'
   );
 
+  const {
+    options: optionsProductionStandards,
+    isLoadingOptions: isLoadingProductionStandards,
+  } = useSelect(ProductionStandardApi.basePath, 'id', 'name');
+
   const kandangUrl = `${KandangApi.basePath}?${new URLSearchParams({
     search: '',
     location_id: selectedLocation == '' ? '0' : selectedLocation,
@@ -341,6 +347,12 @@ const ProjectFlockForm = ({
             label: initialValues.fcr.name,
           }
         : null,
+      production_standard: initialValues?.production_standard
+        ? {
+            value: initialValues.production_standard?.id,
+            label: initialValues.production_standard.name,
+          }
+        : null,
       location: initialValues?.location
         ? {
             value: initialValues.location?.id,
@@ -356,6 +368,7 @@ const ProjectFlockForm = ({
         'GROWING' | 'LAYING' | undefined
       >,
       fcr_id: initialValues?.fcr?.id ?? 0,
+      production_standard_id: initialValues?.production_standard?.id ?? 0,
       location_id: initialValues?.location?.id ?? 0,
       kandang_ids: initialValues?.kandangs?.map(
         (k: Kandang) => k.id
@@ -400,6 +413,7 @@ const ProjectFlockForm = ({
         area_id: values.area_id as number,
         category: values.category as string,
         fcr_id: values.fcr_id as number,
+        production_standard_id: values.production_standard_id as number,
         location_id: values.location_id as number,
         kandang_ids: values.kandang_ids as number[],
         project_budgets: values.project_budgets.flatMap((budget) => {
@@ -858,6 +872,23 @@ const ProjectFlockForm = ({
                 isClearable
                 isDisabled={formType != 'add'}
               />
+              <SelectInput
+                required
+                label='Standar Produksi'
+                value={formik.values.production_standard as OptionType}
+                onChange={(val) => {
+                  optionChangeHandler(val, 'production_standard');
+                }}
+                options={optionsProductionStandards}
+                isLoading={isLoadingProductionStandards}
+                isError={
+                  formik.touched.production_standard &&
+                  Boolean(formik.errors.production_standard)
+                }
+                errorMessage={formik.errors.production_standard as string}
+                isClearable
+                isDisabled={formType != 'add'}
+              />
               <SelectInput
                 required
                 label='Kategori'
diff --git a/src/types/api/production/project-flock.d.ts b/src/types/api/production/project-flock.d.ts
index 35c42c38..b6d43fdb 100644
--- a/src/types/api/production/project-flock.d.ts
+++ b/src/types/api/production/project-flock.d.ts
@@ -16,6 +16,8 @@ export type BaseProjectFlock = {
   category: string;
   fcr: Fcr;
   fcr_id: number;
+  production_standard: ProductionStandard;
+  production_standard_id: number;
   location: Location;
   location_id: number;
   period: number;
@@ -48,6 +50,7 @@ export type CreateProjectFlockPayload = {
   area_id: number;
   category: string;
   fcr_id: number;
+  production_standard_id: number;
   location_id: number;
   kandang_ids: number[];
   project_budgets?: ProjectFlockBudget[];