diff --git a/Software/src/eeprom.cpp b/Software/src/eeprom.cpp
index 6c774c1..f754edc 100644
--- a/Software/src/eeprom.cpp
+++ b/Software/src/eeprom.cpp
@@ -75,12 +75,12 @@ void EEPROM_Process()
 
 void StoreConfig_EEPROM()
 {
-  ConfigData.checksum = 0;
-  ConfigData.checksum = Checksum_EEPROM((uint8_t *)&ConfigData, sizeof(ConfigData));
-
   if (eeAvailable == false)
     return;
 
+  ConfigData.checksum = 0;
+  ConfigData.checksum = Checksum_EEPROM((uint8_t *)&ConfigData, sizeof(ConfigData));
+
   ee.updateBlock(startofConfigData, (uint8_t *)&ConfigData, sizeof(ConfigData));
 }
 
@@ -111,9 +111,6 @@ void GetConfig_EEPROM()
 
 void StorePersistence_EEPROM()
 {
-  PersistenceData.checksum = 0;
-  PersistenceData.checksum = Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData));
-
   if (eeAvailable == false)
     return;
 
@@ -122,6 +119,9 @@ void StorePersistence_EEPROM()
   else
     PersistenceData.writeCycleCounter++;
 
+  PersistenceData.checksum = 0;
+  PersistenceData.checksum = Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData));
+
   ee.updateBlock(globals.eePersistanceAdress, (uint8_t *)&PersistenceData, sizeof(PersistenceData));
 }