diff --git a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
index d2e9d94..f275255 100644
--- a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
+++ b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
@@ -549,10 +549,19 @@ if (!establishment) {
     const formattedProducts = products.map(product => {
       // Get the selected product option to access product_id
       const selectedProduct = productOptions.find(p => p.value === product.product);
-      const existingProduct = currentSubmission.products?.find(p => 
-        p.product_id === product.product_id || 
-        p.product?.id === product.product_id
-      );
+const existingProduct = currentSubmission.products?.find(p => 
+  p.product_id === (selectedProduct?.product_id || product.product_id) || 
+  p.product?.id === (selectedProduct?.product_id || product.product_id)
+);
+console.log('Existing product match:', {
+  productId: product.id,
+  productProductId: product.product_id,
+  selectedProductId: selectedProduct?.product_id,
+  foundExistingProduct: !!existingProduct,
+  existingProductId: existingProduct?.id,
+  existingProductProductId: existingProduct?.product_id,
+  allExistingProductIds: currentSubmission.products?.map(p => p.id) || []
+});
       return {
         id: existingProduct?.id || 0,
         product_id: selectedProduct?.product_id || product.product_id || null,