diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45902db78..86c2b5e93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
 - Undocumented support for non-sequential buttons and switches (#17967)
 - SR04 driver single pin ultrasonic sensor detection (#17966)
 - IR panasonic protocol regression from v12.0.2.4 (#18013)
+- EnergyTotal divided twice during minimal upgrade step regression from v12.3.1.3 (#18024)
 
 ### Removed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dd039ce1d..399d5a158 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -125,3 +125,4 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - Energytotals cannot be set to negative values [#17965](https://github.com/arendst/Tasmota/issues/17965)
 - SR04 driver single pin ultrasonic sensor detection [#17966](https://github.com/arendst/Tasmota/issues/17966)
 - IR panasonic protocol regression from v12.0.2.4 [#18013](https://github.com/arendst/Tasmota/issues/18013)
+- EnergyTotal divided twice during minimal upgrade step regression from v12.3.1.3 [#18024](https://github.com/arendst/Tasmota/issues/18024)
diff --git a/tasmota/tasmota_support/settings.ino b/tasmota/tasmota_support/settings.ino
index 06a322e5d..f53abb684 100644
--- a/tasmota/tasmota_support/settings.ino
+++ b/tasmota/tasmota_support/settings.ino
@@ -1616,17 +1616,21 @@ void SettingsDelta(void) {
     }
     if (Settings->version < 0x0C030103) {  // 12.3.1.3
       for (uint32_t i = 0; i < 3; i++) {
-        RtcSettings.energy_kWhtotal_ph[i] /= 100;
         Settings->energy_kWhtotal_ph[i] /= 100;
-        RtcSettings.energy_kWhexport_ph[i] /= 100;
         Settings->energy_kWhexport_ph[i] /= 100;
+#ifndef FIRMWARE_MINIMAL
+        RtcSettings.energy_kWhtotal_ph[i] /= 100;
+        RtcSettings.energy_kWhexport_ph[i] /= 100;
+#endif
       }
+#ifndef FIRMWARE_MINIMAL
       RtcSettings.energy_usage.usage1_kWhtotal /= 100;
       RtcSettings.energy_usage.usage2_kWhtotal /= 100;
       RtcSettings.energy_usage.return1_kWhtotal /= 100;
       RtcSettings.energy_usage.return2_kWhtotal /= 100;
       RtcSettings.energy_usage.last_return_kWhtotal /= 100;
       RtcSettings.energy_usage.last_usage_kWhtotal /= 100;
+#endif
     }
 
     Settings->version = VERSION;