diff --git a/config.example.h b/config.example.h
index 7909f0a..8bed4ef 100644
--- a/config.example.h
+++ b/config.example.h
@@ -143,6 +143,9 @@ The configuration file for DCC-EX Command Station
 // and want to use the EX-RAIL automation. Otherwise you do not have enough RAM
 // to do that. Of course, then none of the EEPROM related commands work.
 //
+// EEPROM does not work on ESP32. So on ESP32, EEPROM will always be disabled,
+// at least until it works.
+//
 // #define DISABLE_EEPROM
 
 /////////////////////////////////////////////////////////////////////////////////////
diff --git a/defines.h b/defines.h
index 3d54a6f..c4d38a3 100644
--- a/defines.h
+++ b/defines.h
@@ -114,8 +114,12 @@
 #endif
 #elif defined(ARDUINO_ARCH_ESP8266)
 #define ARDUINO_TYPE "ESP8266"
+#warning "ESP8266 platform untested, you are on your own"
 #elif defined(ARDUINO_ARCH_ESP32)
 #define ARDUINO_TYPE "ESP32"
+#ifndef DISABLE_EEPROM
+#define DISABLE_EEPROM
+#endif
 #elif defined(ARDUINO_ARCH_SAMD)
 #define ARDUINO_TYPE "SAMD21"
 #undef USB_SERIAL