diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
index f664905260..3ab832a019 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
@@ -488,6 +488,10 @@ public class PreferencePane extends BasicPane {
                 saveIntervalPane.setVisible(useV2);
                 autoCleanPane.setVisible(useV2);
                 gcControlPane.setVisible(!useV2);
+                useVcsAutoCleanScheduleCheckBox.setSelected(useV2);
+                useVcsAutoSaveScheduleCheckBox.setSelected(useV2);
+                useVcsAutoCleanScheduleCheckBox.setEnabled(useV2 && FineScheduler.getInstance().isStarted());
+                useVcsAutoSaveScheduleCheckBox.setEnabled(useV2);
             }
         });
     };
@@ -505,7 +509,7 @@ public class PreferencePane extends BasicPane {
         autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Content")));
         autoCleanPane.add(autoCleanRetainIntervalComboBox);
         autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Last")));
-        useVcsAutoCleanScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode());
+        useVcsAutoCleanScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode() && FineScheduler.getInstance().isStarted());
         autoCleanPane.setVisible(false);
         return autoCleanPane;
     }