diff --git a/src/components/StockIn/CalculateExpiryDateModal.tsx b/src/components/StockIn/CalculateExpiryDateModal.tsx
index 190b209..e49f621 100644
--- a/src/components/StockIn/CalculateExpiryDateModal.tsx
+++ b/src/components/StockIn/CalculateExpiryDateModal.tsx
@@ -142,6 +142,16 @@ const CalculateExpiryDateModal: React.FC<Props> = ({
         }
     }, [productionDate, shelfLife, expiryDate]);
 
+    useEffect(() => {
+        if (!open) return;
+        const today = dayjs();
+        // only set if different to avoid loop
+        setProductionDate(prev => (prev && prev.isSame(today, "day") ? prev : today));
+        if (shelfLife !== undefined) {
+            setExpiryDate(today.add(shelfLife, "day"));
+        }
+    }, [open, shelfLife]);
+
     return (
         <Modal
             open={open}