diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json b/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json
index 892b07bd..6451c284 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/configuration.json
@@ -3,7 +3,7 @@
         "id": 9,
         "version": {
             "first": 1,
-            "last": 158
+            "last": 159
         },
         "registers": {
             "AlarmStatus0": {
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFilesEraseRestore.json b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFilesEraseRestore.json
index 0afde89a..47413deb 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFilesEraseRestore.json
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFilesEraseRestore.json
@@ -4,16 +4,12 @@
         "1\\fdrdata",
         "1\\logdata",
         "1\\blklist",
-        "1\\mettable",
         "1\\pulsedbg",
         "1\\upg*",
         "1\\img*"
     ],
     "Restore": [
         {
-            "Name": "1\\tstfile",
-            "ByteSize": 262144,
-            "Pattern": null
         }
     ]
 }
\ No newline at end of file
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
index 97df6dad..be49218d 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
@@ -1419,7 +1419,7 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
         /// </summary>
         /// <param name="successExitState"></param>
         /// <param name="errorExitState"></param>
-        /// <remarks date="2024-May-13..15" author="Thomas Wiedebusch">
+        /// <remarks date="2024-May-13..17" author="Thomas Wiedebusch">
         /// - Initial.
         /// </remarks>
         private void CorrectPowerOverestimation(ProcessState successExitState,
@@ -1455,12 +1455,15 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
             //         using the preset _fwUpdatePowerCorrection.ActualFwVersion on initial connect as after
             //         the FW update this is lost in _currentGenesis.InstalledFwVersion and overwritten by the
             //         new version after the FW update!
+            // REMIND: Update only allowed if the actual FW version is higher or equal to threshold (Update succeeded)
             if ((_currentGenesis.Region == "EMEA" &&
                   _cordonelFirmwarePackage.FwPackageInfo.Version >= PowCorrConst.EmeaFwThresholdForPowCorr &&
-                  _fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.EmeaFwThresholdForPowCorr) ||
+                  _fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.EmeaFwThresholdForPowCorr &&
+                  _currentGenesis.InstalledFwVersion >= PowCorrConst.EmeaFwThresholdForPowCorr) ||
                  (_currentGenesis.Region == "NA" &&
                   _cordonelFirmwarePackage.FwPackageInfo.Version >= PowCorrConst.NaFNaFwThresholdForPowCorr &&
-                  _fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.NaFNaFwThresholdForPowCorr))
+                  _fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.NaFNaFwThresholdForPowCorr &&
+                  _currentGenesis.InstalledFwVersion >= PowCorrConst.NaFNaFwThresholdForPowCorr))
             {
                 // CASE 2.1: Missing power correction settings from FW update package
                 // preset meter power correction file