diff --git a/keyboards/zsa/ergodox_ez/ergodox_ez.c b/keyboards/zsa/ergodox_ez/ergodox_ez.c
index 6e1dd2f090..df1ab27cbc 100644
--- a/keyboards/zsa/ergodox_ez/ergodox_ez.c
+++ b/keyboards/zsa/ergodox_ez/ergodox_ez.c
@@ -38,6 +38,11 @@ void keyboard_post_init_kb(void) {
     keyboard_config.raw = eeconfig_read_kb();
     ergodox_led_all_set((uint8_t)keyboard_config.led_level * 255 / 4);
     ergodox_blink_all_leds();
+#    if defined(RGB_MATRIX_ENABLE)
+    if (rgb_matrix_get_mode() >= RGB_MATRIX_EFFECT_MAX) {
+            rgb_matrix_mode(RGB_MATRIX_NONE);
+    }
+#    endif
 
     keyboard_post_init_user();
 }
diff --git a/keyboards/zsa/moonlander/moonlander.c b/keyboards/zsa/moonlander/moonlander.c
index 011d049e4f..b167cd18bc 100644
--- a/keyboards/zsa/moonlander/moonlander.c
+++ b/keyboards/zsa/moonlander/moonlander.c
@@ -396,6 +396,9 @@ void keyboard_post_init_kb(void) {
         eeconfig_update_kb(keyboard_config.raw);
     }
 #ifdef RGB_MATRIX_ENABLE
+    if (rgb_matrix_get_mode() >= RGB_MATRIX_EFFECT_MAX) {
+            rgb_matrix_mode(RGB_MATRIX_NONE);
+    }
     rgb_matrix_enable_noeeprom();
 #endif
 #if defined(DEFERRED_EXEC_ENABLE)