diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 4dcf5e27547b..a67707895dc3 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -350,6 +350,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
         case TOGGLE_LAYER_COLOR:
             if (record->event.pressed) {
                 keyboard_config.disable_layer_led ^= 1;
+                if (keyboard_config.disable_layer_led)
+                    rgb_matrix_set_color_all(0, 0, 0);
                 eeconfig_update_kb(keyboard_config.raw);
             }
             break;
@@ -359,6 +361,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 case LED_FLAG_ALL: {
                     rgb_matrix_set_flags(LED_FLAG_NONE);
                     keyboard_config.rgb_matrix_enable = false;
+                    rgb_matrix_set_color_all(0, 0, 0);
                   }
                   break;
                 default: {
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index fc2c938eeba1..543f04a67fea 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -279,6 +279,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
         case TOGGLE_LAYER_COLOR:
             if (record->event.pressed) {
                 keyboard_config.disable_layer_led ^= 1;
+              if (keyboard_config.disable_layer_led)
+                    rgb_matrix_set_color_all(0, 0, 0);
                 eeconfig_update_kb(keyboard_config.raw);
             }
             break;
@@ -288,6 +290,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 case LED_FLAG_ALL: {
                     rgb_matrix_set_flags(LED_FLAG_NONE);
                     keyboard_config.rgb_matrix_enable = false;
+                    rgb_matrix_set_color_all(0, 0, 0);
                   }
                   break;
                 default: {