diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx
index 4595c05c..3a54e77d 100644
--- a/src/components/pages/production/recording/form/RecordingForm.tsx
+++ b/src/components/pages/production/recording/form/RecordingForm.tsx
@@ -605,7 +605,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
     loadMore: loadMoreStockProducts,
   } = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', {
     flags: 'PAKAN,OVK',
+    limit: '100',
     location_id: stockProductsLocationId,
+    ...(selectedKandangId
+      ? { kandang_id: selectedKandangId.toString() }
+      : {}),
   });
 
   const {
@@ -613,7 +617,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
     isLoadingOptions: isLoadingDepletionProducts,
     loadMore: loadMoreDepletionProducts,
   } = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', '', {
+    limit: '100',
     location_id: depletionProductsLocationId,
+    ...(selectedKandangId
+      ? { kandang_id: selectedKandangId.toString() }
+      : {}),
     type: 'AYAM',
   });
 
@@ -678,8 +686,12 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
     isLoadingOptions: isLoadingEggProducts,
     loadMore: loadMoreEggProducts,
   } = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', {
+    limit: '100',
     type: 'TELUR',
     location_id: eggProductsLocationId,
+    ...(selectedKandangId
+      ? { kandang_id: selectedKandangId.toString() }
+      : {}),
   });
 
   const approvedProjectFlockKandangsUrl = useMemo(() => {
diff --git a/src/lib/product-warehouse.ts b/src/lib/product-warehouse.ts
index bd714223..8e3680da 100644
--- a/src/lib/product-warehouse.ts
+++ b/src/lib/product-warehouse.ts
@@ -50,7 +50,11 @@ export const isProductWarehouseSelectableForKandang = (
   }
 
   if (warehouse.type === 'KANDANG') {
-    return Boolean(kandangId) && warehouse.kandang?.id === kandangId;
+    return (
+      Boolean(kandangId) &&
+      (warehouse.kandang?.id === kandangId ||
+        productWarehouse.project_flock_kandang?.kandang_id === kandangId)
+    );
   }
 
   return false;