diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 2cc2311e693..fd2ce79486e 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -30,7 +30,6 @@
 
 #include <utils/algorithm.h>
 
-#include <QCoreApplication>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRegularExpression>
@@ -433,7 +432,7 @@ QList<Kit *> existingKits(const McuTarget *mcuTarget)
     using namespace Constants;
     // some models have compatible name changes that refere to the same supported board across versions.
     // name changes are tracked here to recognize the corresponding kits as upgradable.
-    static QMap<QString, QStringList> upgradable_to = {
+    static const QMap<QString, QStringList> upgradable_to = {
         {"MIMXRT1170-EVK-FREERTOS", {"MIMXRT1170-EVKB-FREERTOS"}}};
     return Utils::filtered(KitManager::kits(), [mcuTarget](Kit *kit) {
         return kit->value(KIT_MCUTARGET_KITVERSION_KEY) == KIT_VERSION
diff --git a/src/plugins/mcusupport/mcutarget.cpp b/src/plugins/mcusupport/mcutarget.cpp
index faef32b61ba..84cc80f7aa0 100644
--- a/src/plugins/mcusupport/mcutarget.cpp
+++ b/src/plugins/mcusupport/mcutarget.cpp
@@ -7,6 +7,7 @@
 #include "mcusupport_global.h"
 #include "mcusupportplugin.h"
 #include "mcusupporttr.h"
+#include "mcusupportconstants.h"
 
 #include <utils/algorithm.h>
 
@@ -115,12 +116,13 @@ void McuTarget::handlePackageProblems(MessagesList &messages) const
 
 void McuTarget::resetInvalidPathsToDefault()
 {
-
     for (McuPackagePtr package : std::as_const(m_packages)) {
         if (!package)
             continue;
         if (package->isValidStatus())
             continue;
+        if (package->settingsKey() == Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK)
+            continue;
         package->setPath(package->defaultPath());
         package->writeToSettings();
     }