diff --git a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino
index 5d2961e1237..729167ad96d 100644
--- a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino
+++ b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino
@@ -19,19 +19,19 @@ void setup() {
   Serial.begin(115200);
   delay(1000);
   Serial.println("Testing EEPROMClass\n");
-  if (!NAMES.begin(0x500)) {
+  if (!NAMES.begin(NAMES.capacity())) {
     Serial.println("Failed to initialise NAMES");
     Serial.println("Restarting...");
     delay(1000);
     ESP.restart();
   }
-  if (!HEIGHT.begin(0x200)) {
+  if (!HEIGHT.begin(HEIGHT.capacity())) {
     Serial.println("Failed to initialise HEIGHT");
     Serial.println("Restarting...");
     delay(1000);
     ESP.restart();
   }
-  if (!AGE.begin(0x100)) {
+  if (!AGE.begin(AGE.capacity())) {
     Serial.println("Failed to initialise AGE");
     Serial.println("Restarting...");
     delay(1000);
diff --git a/libraries/EEPROM/src/EEPROM.cpp b/libraries/EEPROM/src/EEPROM.cpp
index c1bcfeec191..11007764ce5 100644
--- a/libraries/EEPROM/src/EEPROM.cpp
+++ b/libraries/EEPROM/src/EEPROM.cpp
@@ -207,6 +207,14 @@ uint8_t * EEPROMClass::getDataPtr() {
   return &_data[0];
 }
 
+/*
+   Get EEPROM total size in byte defined by the user
+*/
+uint16_t EEPROMClass::capacity ()
+{
+  return _size;
+}
+
 /*
    Get EEPROM total size in byte defined by the user
 */
diff --git a/libraries/EEPROM/src/EEPROM.h b/libraries/EEPROM/src/EEPROM.h
index b4e849f536b..6c50d591fe4 100644
--- a/libraries/EEPROM/src/EEPROM.h
+++ b/libraries/EEPROM/src/EEPROM.h
@@ -42,6 +42,7 @@ class EEPROMClass {
     bool begin(size_t size);
     uint8_t read(int address);
     void write(int address, uint8_t val);
+    uint16_t capacity();
     uint16_t length();
     bool commit();
     void end();