diff --git a/Front-End/src/components/PaymentPlanSelector.js b/Front-End/src/components/PaymentPlanSelector.js
index dfa5aa9..b44863e 100644
--- a/Front-End/src/components/PaymentPlanSelector.js
+++ b/Front-End/src/components/PaymentPlanSelector.js
@@ -57,7 +57,12 @@ const PaymentPlanSelector = ({ paymentPlans, setPaymentPlans, handleEdit, type }
     if (currentDates && currentDates.length > 0) {
       const days = currentDates.map(date => new Date(date).getDate());
       const allSameDay = days.every(day => day === days[0]);
-      setDefaultDay(allSameDay ? days[0] : '-');
+      if (allSameDay) {
+        setDefaultDay(days[0]);
+      } else {
+        setDefaultDay('-');
+        setIsDefaultDayModified(false);
+      }
     } else {
       setDefaultDay('-');
     }
@@ -145,6 +150,8 @@ const PaymentPlanSelector = ({ paymentPlans, setPaymentPlans, handleEdit, type }
 
     setErrorMsg('');
     setIsDefaultDayModified(true);
+    setResetModifiedDates(true);
+    setTimeout(() => setResetModifiedDates(false), 0);
 
     // Mettre à jour les dates d'échéance en fonction du jour sélectionné
     const updatedDates = dates[selectedFrequency].map(date => {
@@ -169,8 +176,6 @@ const PaymentPlanSelector = ({ paymentPlans, setPaymentPlans, handleEdit, type }
         setPopupMessage(`Mise à jour des dates d'échéances effectuée avec succès`);
         setPopupVisible(true);
         setIsDefaultDayModified(false);
-        setResetModifiedDates(true);
-        setTimeout(() => setResetModifiedDates(false), 0);
       })
       .catch(error => {
         console.error(error);
@@ -236,7 +241,7 @@ const PaymentPlanSelector = ({ paymentPlans, setPaymentPlans, handleEdit, type }
                   errorMsg={errorMsg}
                 />
               </div>
-              {isDefaultDayModified && (
+              {isDefaultDayModified && defaultDay && (
                 <button
                   type="button"
                   onClick={handleSubmitDefaultDay}