diff --git a/companion/src/storage/appdata.cpp b/companion/src/storage/appdata.cpp
index cd5c129e4..f529c780c 100644
--- a/companion/src/storage/appdata.cpp
+++ b/companion/src/storage/appdata.cpp
@@ -427,7 +427,7 @@ void AppData::convertSettings(QSettings & settings)
                               <<  fmtHex(CPN_SETTINGS_VERSION) << " (" << fmtHex(currMajMin)  << "). Removing unused: " << removeUnused;
 
   // firmwares renamed from opentx-* to edgetx-* at 2.6
-  if (savedMajMin < 0x206) {
+  if (savedMajMin <= 0x207) {        // Note: change merged post 2.6 rc 1 and version bumped to 2.7 the Nightly users also require upgrade
     qInfo().noquote() << "Converting profiles";
     static const QString profileFwTypePath = QStringLiteral("Profiles/profile%1/fwType");
     for (int i = 0; i < MAX_PROFILES; i++) {
diff --git a/companion/src/storage/appdata.h b/companion/src/storage/appdata.h
index 3afa1dc77..9741aa96d 100644
--- a/companion/src/storage/appdata.h
+++ b/companion/src/storage/appdata.h
@@ -40,7 +40,7 @@
 
 //! CPN_SETTINGS_REVISION is used to track settings changes independently of EdgeTX version. It should be reset to zero whenever settings are migrated to new COMPANY or PRODUCT.
 //! \note !! Increment this value if properties are removed or refactored. It will trigger a conversion/cleanup of any stored settings. \sa AppData::convertSettings()
-#define CPN_SETTINGS_REVISION       0
+#define CPN_SETTINGS_REVISION       1 // Note: bumped to ensure 2.7 Nightly version users also get upgraded
 
 //! CPN_SETTINGS_VERSION is used for settings data version tracking.
 #define CPN_SETTINGS_VERSION        ((VERSION_NUMBER << 8) | CPN_SETTINGS_REVISION)