diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index a466a3212..ad2ad30d4 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -5,7 +5,7 @@
 - Change some more Settings locations freeing up space for future single char allowing variable length text
 - Add Zigbee send automatic ZigbeeRead after sending a command
 - Add Zigbee improving Occupancy:false detection for Aqara sensor
-- Add fallback functionality from next version 7.1.2.7
+- Add fallback functionality from next version 8.x
 
 ### 7.1.2.5 20191213
 
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index d1d3fc1e8..d5c59246f 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -471,7 +471,7 @@ bool SettingsUpdateText(uint32_t index, const char* replace_me)
   char replace[replace_len +1];
   memcpy(replace, replace_me, sizeof(replace));
 
-  if (Settings.version < 0x07010207) {
+  if (Settings.version < 0x08000000) {
     uint32_t idx = 0;
     switch (index) {
       case SET_OTAURL:            strlcpy(Settings.ota_url, replace, sizeof(Settings.ota_url)); break;
@@ -575,7 +575,7 @@ char* SettingsText(uint32_t index)
 
   char* position = Settings.ota_url;
 
-  if (Settings.version < 0x07010207) {
+  if (Settings.version < 0x08000000) {
     uint32_t idx = 0;
     switch (index) {
       case SET_MQTTPREFIX3:       idx++;
@@ -1387,7 +1387,7 @@ void SettingsDelta(void)
       memcpy((char*)&Settings.serial_config, (char*)&Settings.ex_serial_config, 5);  // 1E4 -> EFE
     }
 
-    if ((VERSION < 0x7010207) && (Settings.version > VERSION)) {
+    if ((VERSION < 0x08000000) && (Settings.version > VERSION)) {
       char temp[strlen(SettingsText(SET_OTAURL)) +1];        strncpy(temp, SettingsText(SET_OTAURL), sizeof(temp));
       char temp21[strlen(SettingsText(SET_MQTTPREFIX1)) +1]; strncpy(temp21, SettingsText(SET_MQTTPREFIX1), sizeof(temp21));
       char temp22[strlen(SettingsText(SET_MQTTPREFIX2)) +1]; strncpy(temp22, SettingsText(SET_MQTTPREFIX2), sizeof(temp22));