diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index 985aae1a..a249888f 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -148,7 +148,8 @@
 // EEPROM
 //------------------------------------------------------------------------------
 
-#define EEPROM_SIZE             4096            // EEPROM size in bytes
+#define EEPROM_SIZE             SPI_FLASH_SEC_SIZE  // EEPROM size in bytes (1 sector = 4096 bytes)
+
 //#define EEPROM_RORATE_SECTORS   2             // Number of sectors to use for EEPROM rotation
                                                 // If not defined the firmware will use a number based
                                                 // on the number of available sectors
diff --git a/code/espurna/settings.ino b/code/espurna/settings.ino
index 31d70aa1..713ede6e 100644
--- a/code/espurna/settings.ino
+++ b/code/espurna/settings.ino
@@ -443,8 +443,6 @@ void settingsRegisterCommand(const String& name, void (*call)(Embedis*)) {
 
 void settingsSetup() {
 
-    EEPROMr.begin(SPI_FLASH_SEC_SIZE);
-
     _serial.callback([](uint8_t ch) {
         #if TELNET_SUPPORT
             telnetWrite(ch);