diff --git a/tmk_core/common/avr/eeconfig.c b/tmk_core/common/avr/eeconfig.c
index 47c25746..5556609d 100644
--- a/tmk_core/common/avr/eeconfig.c
+++ b/tmk_core/common/avr/eeconfig.c
@@ -10,11 +10,7 @@ void eeconfig_init(void)
     eeprom_write_word(EECONFIG_MAGIC,          EECONFIG_MAGIC_NUMBER);
     eeprom_write_byte(EECONFIG_DEBUG,          0);
     eeprom_write_byte(EECONFIG_DEFAULT_LAYER,  0);
-#if defined(NKRO_ENABLE) || defined(NKRO_6KRO_ENABLE)
-    eeprom_write_byte(EECONFIG_KEYMAP,         ((keymap_config_t) { .nkro = 1 }).raw);
-#else
     eeprom_write_byte(EECONFIG_KEYMAP,         0);
-#endif
     eeprom_write_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
 #ifdef BACKLIGHT_ENABLE
     eeprom_write_byte(EECONFIG_BACKLIGHT,      0);
diff --git a/tmk_core/common/bootmagic.c b/tmk_core/common/bootmagic.c
index 1dacea32..e54fe0ab 100644
--- a/tmk_core/common/bootmagic.c
+++ b/tmk_core/common/bootmagic.c
@@ -94,7 +94,9 @@ void bootmagic(void)
     eeconfig_write_keymap(kc.raw);
 
 #if defined(NKRO_ENABLE) || defined(NKRO_6KRO_ENABLE)
-    keyboard_nkro = kc.nkro;
+    if (kc.nkro) {
+        keyboard_nkro = !keyboard_nkro;
+    }
 #endif
 
     /* default layer */