1 files changed, 4 insertions, 1 deletions
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index a65f9d6d18..1a89e70e34 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -257,7 +257,10 @@ __attribute__((weak)) void keyboard_post_init_kb(void) {
 void keyboard_setup(void) {
     print_set_sendchar(sendchar);
 #ifdef EEPROM_DRIVER
-    eeprom_driver_init();
+    if (!eeprom_driver_init()) {
+        eeconfig_init();
+        eeprom_driver_init();
+    }
 #endif
     matrix_setup();
     keyboard_pre_init_kb();