diff --git a/speeduino/storage.h b/speeduino/storage.h
index 3ecbd0cc..3fb9aa9f 100644
--- a/speeduino/storage.h
+++ b/speeduino/storage.h
@@ -7,7 +7,11 @@ void loadConfig();
 void loadCalibration();
 void writeCalibration();
 
+#if defined(CORE_STM32) || defined(CORE_TEENSY)
+#define EEPROM_MAX_WRITE_BLOCK 64 //The maximum number of write operations that will be performed in one go. If we try to write to the EEPROM too fast (Each write takes ~3ms) then the rest of the system can hang)
+#else
 #define EEPROM_MAX_WRITE_BLOCK 30 //The maximum number of write operations that will be performed in one go. If we try to write to the EEPROM too fast (Each write takes ~3ms) then the rest of the system can hang)
+#endif
 bool eepromWritesPending = false;
 
 /*