diff --git a/src/stores/Products/Index.js b/src/stores/Products/Index.js
index 9582290..6317f25 100644
--- a/src/stores/Products/Index.js
+++ b/src/stores/Products/Index.js
@@ -151,15 +151,19 @@ export const useProductsStore = create(
     },
 
     getAgencyProducts: async (param) => {
-      const { setLoading, setActiveAgency, setAgencyProducts, setEditingProduct } = get();
+      const { setLoading, setActiveAgency, setAgencyProducts, editingProduct, setEditingProduct } = get();
       setLoading(true);
       setAgencyProducts({});
-      setEditingProduct({});
+      // setEditingProduct({});
       const res = await getAgencyProductsAction(param);
 
       const productsData = groupBy(res.products, (row) => row.info.product_type_id);
       setAgencyProducts(productsData);
       setActiveAgency(res.agency);
+      if (editingProduct?.info?.id) {
+        const item = (productsData[editingProduct.info.product_type_id] || []).find((item) => item.info.id === editingProduct.info.id);
+        setEditingProduct(item);
+      }
       setLoading(false);
     },
 
diff --git a/src/views/products/Audit.jsx b/src/views/products/Audit.jsx
index 371613d..f469c49 100644
--- a/src/views/products/Audit.jsx
+++ b/src/views/products/Audit.jsx
@@ -58,7 +58,7 @@ const PriceTable = ({ productType, dataSource, refresh }) => {
   const columns = [
     { key: 'title', dataIndex: ['info', 'title'], width: '16rem', title: t('Title'), onCell: (r, index) => ({ rowSpan: r.rowSpan, }), className: 'bg-white', render: (text, r) => {
       const title = text || r.lgc_details?.['2']?.title || r.lgc_details?.['1']?.title || '';
-      return isPermitted(PERM_PRODUCTS_OFFER_PUT) ? <Link to={`/products/${travel_agency_id}/${use_year}/${audit_state}/edit`} onClick={() => setEditingProduct(r.info)}>{title}</Link> : title;
+      return isPermitted(PERM_PRODUCTS_OFFER_PUT) ? <Link to={`/products/${travel_agency_id}/${use_year}/${audit_state}/edit`} onClick={() => setEditingProduct({info: r.info})}>{title}</Link> : title;
     } },
     // ...(productType === 'B' ? [{ key: 'km', dataIndex: ['info', 'km'], title: t('KM')}] : []),
     { key: 'adult', title: t('AgeType.Adult'), render: (_, { adult_cost, currency, unit_id, unit_name }) => `${adult_cost} ${currency} / ${t(`PriceUnit.${unit_id}`)}` },