diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java
index 38b54224e..eec26d3f1 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java
@@ -109,10 +109,6 @@ public class GameDownloadPanel extends AnimatedPanel {
             .reg((ver) -> model.addRow(new Object[] { ver.id, ver.time,
                                                       StrUtils.equalsOne(ver.type, "old_beta", "old_alpha", "release", "snapshot") ? C.i18n("versions." + ver.type) : ver.type }))
             .regDone(lstDownloads::requestFocus).execute();
-        /*(e) -> {
-                           MessageBox.Show("Failed to refresh download: " + e.getLocalizedMessage());
-                           HMCLog.err("Failed to refresh download.", e);
-                       }, );*/
     }
 
     void downloadMinecraft() {
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java
index 7dbcd7749..b4b5d6114 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java
@@ -1005,12 +1005,13 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
     }//GEN-LAST:event_btnChoosingJavaDirActionPerformed
 
     private void cboJavaItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cboJavaItemStateChanged
-        if (isLoading || evt.getStateChange() != ItemEvent.SELECTED || cboJava.getSelectedIndex() < 0 || StrUtils.isBlank((String) cboJava.getSelectedItem()))
+        if (evt.getStateChange() != ItemEvent.SELECTED || cboJava.getSelectedIndex() < 0 || StrUtils.isBlank((String) cboJava.getSelectedItem()))
             return;
         int idx = cboJava.getSelectedIndex();
         if (idx != -1) {
             Java j = Java.JAVA.get(idx);
-            Settings.getLastProfile().getSelectedVersionSetting().setJava(j);
+            if (!isLoading)
+                Settings.getLastProfile().getSelectedVersionSetting().setJava(j);
             txtJavaDir.setEnabled(idx == 1);
             txtJavaDir.setText(j.getHome() == null ? Settings.getLastProfile().getSelectedVersionSetting().getSettingsJavaDir() : j.getJava());
         }
@@ -1187,7 +1188,6 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
         cboRunDirectory.setSelectedIndex(profile.getGameDirType().ordinal());
         cboJava.setSelectedIndex(profile.getJavaIndexInAllJavas());
         isLoading = false;
-        cboJavaItemStateChanged(new ItemEvent(cboJava, 0, cboJava.getSelectedItem(), ItemEvent.SELECTED));
     }
 
     /**
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultMinecraftService.java
index a970807a1..ae88cb558 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultMinecraftService.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/DefaultMinecraftService.java
@@ -64,14 +64,6 @@ public class DefaultMinecraftService extends IMinecraftService {
         this.mds = new MinecraftDownloadService(this);
         this.mas = new MinecraftAssetService(this);
         this.mis = new MinecraftInstallerService(this);
-
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-                for (String key : versionSettings.keySet())
-                    saveVersionSetting(key);
-            }
-        });
     }
 
     private void checkModpack() {