diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index e82911da47..6f9e527832 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -955,15 +955,7 @@ void setup() {
 
   // Load data from EEPROM if available (or use defaults)
   // This also updates variables in the planner, elsewhere
-  #if ENABLED(EEPROM_AUTO_INIT)
-    if (!settings.load()) {
-      (void)settings.reset();
-      (void)settings.save();
-      SERIAL_ECHO_MSG("EEPROM Initialized");
-    }
-  #else
-    (void)settings.load();
-  #endif
+  (void)settings.load();
 
   #if HAS_M206_COMMAND
     // Initialize current position based on home_offset
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 7742710bd6..50d5214ff2 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -2071,6 +2071,10 @@ void MarlinSettings::postprocess() {
       return success;
     }
     reset();
+    #if ENABLED(EEPROM_AUTO_INIT)
+      (void)save();
+      SERIAL_ECHO_MSG("EEPROM Initialized");
+    #endif
     return true;
   }