diff --git a/HMCL/java.cpp b/HMCL/java.cpp
index d82f210..f1cdc71 100644
--- a/HMCL/java.cpp
+++ b/HMCL/java.cpp
@@ -190,7 +190,8 @@ void HLSearchJavaInPath(HLJavaList &result, const std::wstring &path, LPCWSTR ja
       javaExecutable /= javaExecutableName;
 
       // https://github.com/HMCL-dev/HMCL/issues/4079
-      if (javaExecutable.path.find(L"\\Common Files\\Oracle\\Java\\") == std::wstring::npos) {
+      if ( (javaExecutable.path.find(L"\\Common Files\\Oracle\\Java\\") == std::wstring::npos) || 
+           (javaExecutable.path.find(L"\\COMMON FILES\\ORACLE\\JAVA\\") == std::wstring::npos) ) {
         HLDebugLogVerbose(L"Checking " + javaExecutable.path);
         result.TryAdd(javaExecutable);
       } else {
diff --git a/HMCL/main.cpp b/HMCL/main.cpp
index b091652..c40402d 100644
--- a/HMCL/main.cpp
+++ b/HMCL/main.cpp
@@ -130,21 +130,6 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd
     }
   }
 
-  {
-    const auto appDataPath = HLGetEnvPath(L"APPDATA");
-    if (appDataPath.has_value() && !appDataPath.value().path.empty()) {
-      HLPath hmclJavaDir = appDataPath.value() / L".hmcl\\java";
-      if (isARM64) {
-        hmclJavaDir /= L"windows-arm64";
-      } else if (isX64) {
-        hmclJavaDir /= L"windows-x86_64";
-      } else {
-        hmclJavaDir /= L"windows-x86";
-      }
-      HLSearchJavaInDir(javaRuntimes, hmclJavaDir, javaExecutableName);
-    }
-  }
-
   // Search Java in PATH
   {
     const auto paths = HLGetEnvVar(L"PATH");