diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index a40222b41..9cd0445e6 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -647,8 +647,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_settings->registerSetting("JvmArgs", "");
         m_settings->registerSetting("IgnoreJavaCompatibility", false);
         m_settings->registerSetting("IgnoreJavaWizard", false);
-        m_settings->registerSetting("AutomaticJavaSwitch", false);
-        m_settings->registerSetting("AutomaticJavaDownload", false);
+        auto defaultEnableAutoJava = m_settings->get("JavaPath").toString().isEmpty();
+        m_settings->registerSetting("AutomaticJavaSwitch", defaultEnableAutoJava);
+        m_settings->registerSetting("AutomaticJavaDownload", defaultEnableAutoJava);
 
         // Legacy settings
         m_settings->registerSetting("OnlineFixes", false);