diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 00335be2ef1..7af3bb417b6 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -230,9 +230,14 @@ ToolChainList AndroidToolChainFactory::autodetectToolChainsFromNdks(
                     atc->setPlatformCodeGenFlags({"-target", target});
                     atc->setPlatformLinkerFlags({"-target", target});
                     atc->setDisplayName(displayName);
-                    atc->resetToolChain(compilerCommand);
                     tc = atc;
                 }
+
+                // Do not only reset newly created toolchains. This triggers call to
+                // addToEnvironment, so that e.g. JAVA_HOME gets updated.
+                if (auto gccTc = dynamic_cast<GccToolChain*>(tc))
+                    gccTc->resetToolChain(compilerCommand);
+
                 tc->setDetection(ToolChain::AutoDetection);
                 result << tc;
                 ++targetItr;